Changeset 9421

Timestamp:

25 Oct 2012, 22:45:08 (12 years ago)

Author:

Henrik Bettermann

Message:

Let's add at least one successful row with imported level_session. checkConversion had to be fixed because level_session was a string.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

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

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

@@ -623 +623 @@
         # the parent studylevel exists and if its level_session
         # attribute corresponds with the expected value in row.
-        level_session = row.get('level_session', IGNORE_MARKER)
-        if level_session not in (IGNORE_MARKER, ''):
+        level_session = conv_dict.get('level_session', IGNORE_MARKER)
+        if level_session not in (IGNORE_MARKER, None):
             site = grok.getSite()
             studylevel = self.getParent(row, site)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_courseticket_data.csv

@@ -3 +3 @@
 2,,100,COURSE1,2,False,
 ,100002,100,COURSE1,3,False,
+1,,200,COURSE1,1,True,2008
 1,,nonsense,COURSE1,5,,
 1,,100,NONSENSE,5,,
 1,,200,COURSE1,6,,2004
 1,,300,COURSE1,6,,2008
-1,,300,COURSE1,6,,200888
+1,,300,COURSE1,6,,2008X

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

@@ -743 +743 @@
             '1,COURSE1,,200,2004,6,,level_session: does not match 2008\r\n'
             '1,COURSE1,,300,2008,6,,level: does not exist\r\n'
-            '1,COURSE1,,300,200888,6,,level_session: Invalid value; level: does not exist\r\n')
+            '1,COURSE1,,300,2008X,6,,level_session: Invalid value\r\n')
         assert self.processor.entryExists(
             dict(reg_number='1', level='100', code='COURSE1'),
@@ -786 +786 @@
             '1,COURSE1,<IGNORE>,200,2004,6,<IGNORE>,level_session: does not match 2008\r\n'
             '1,COURSE1,<IGNORE>,300,2008,6,<IGNORE>,level: does not exist\r\n'
-            '1,COURSE1,<IGNORE>,300,200888,6,<IGNORE>,level_session: Invalid value; level: does not exist\r\n')
+            '1,COURSE1,<IGNORE>,300,2008X,6,<IGNORE>,level_session: Invalid value\r\n')
         shutil.rmtree(os.path.dirname(fin_file))