Changeset 10613

Timestamp:

10 Sep 2013, 16:47:04 (11 years ago)

Author:

Henrik Bettermann

Message:

If certificate was given in import file but the parent container of an applicant doesn't exist , conversion checking exited with a traceback. We are now catching this error.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• batching.py (modified) (1 diff)
• tests/sample_faulty_applicant_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py

@@ -304 +304 @@
             # course1 application category must match container's.
             parent = self.getParent(row, self.site)
-            if cert.application_category != parent.application_category:
+            if parent is None:
+                errs.append(('container', 'not found'))
+            elif cert.application_category != parent.application_category:
                 errs.append(('course1', 'wrong application category'))
         if 'state' in row and \

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/sample_faulty_applicant_data.csv

@@ -3 +3 @@
 5678,dp2011,1005,Jim,Knopf,1990-01-06,xx@yy.zz,CERT2,m,,
 6789,dp2011,1006,Lukas,Knopf,1990-01-07,xx@yy.zz,CERT3,m,,
+,,8888,Mister,No,1990-01-07,no@yy.zz,CERT1,m,,
+,dp2012,9999,Miss,Nobody,1990-01-07,nobody@yy.zz,CERT1,m,,

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -334 +334 @@
                     'Wrong birthdate of imported applicant '
                     '(1990-01-02, should be: 1990-02-01)')
-        self.assertEqual(num_warns,2)
+        self.assertEqual(num_warns,4)
         fail_contents = open(fail_file, 'rb').read()
         # CERT2 is in wrong category ...
@@ -340 +340 @@
         # ... and CERT3 does not exist.
         self.assertTrue('course1: Invalid value' in fail_contents)
+        # Conversion checking already fails because Mister or Miss No's 
+        # container does not exist.
+        self.assertTrue('no@yy.zz,container: not found' in fail_contents)
+        self.assertTrue('nobody@yy.zz,container: not found' in fail_contents)
         shutil.rmtree(os.path.dirname(fail_file))
         return