Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py	(revision 6850)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py	(revision 6851)
@@ -54,4 +54,11 @@
     '\n')[0].split(',')
 
+STUDENT_SAMPLE_DATA_UPDATE2 = open(
+    os.path.join(os.path.dirname(__file__), 'sample_student_data_update2.csv'),
+    'rb').read()
+
+STUDENT_HEADER_FIELDS_UPDATE2 = STUDENT_SAMPLE_DATA_UPDATE2.split(
+    '\n')[0].split(',')
+
 STUDENT_SAMPLE_DATA = open(
     os.path.join(os.path.dirname(__file__), 'sample_student_data.csv'),
@@ -99,7 +106,11 @@
         self.workdir = tempfile.mkdtemp()
         self.csv_file = os.path.join(self.workdir, 'sample_student_data.csv')
-        self.csv_file_update = os.path.join(self.workdir, 'sample_student_data_update.csv')
+        self.csv_file_update = os.path.join(
+            self.workdir, 'sample_student_data_update.csv')
+        self.csv_file_update2 = os.path.join(
+            self.workdir, 'sample_student_data_update2.csv')
         open(self.csv_file, 'wb').write(STUDENT_SAMPLE_DATA)
         open(self.csv_file_update, 'wb').write(STUDENT_SAMPLE_DATA_UPDATE)
+        open(self.csv_file_update2, 'wb').write(STUDENT_SAMPLE_DATA_UPDATE2)
 
     def tearDown(self):
@@ -144,10 +155,12 @@
 
     def test_delEntry(self):
-        self.importer.delEntry(dict(student_id=self.student.student_id), self.app)
+        self.importer.delEntry(
+            dict(student_id=self.student.student_id), self.app)
         assert self.student.student_id not in self.app['students'].keys()
 
     def test_delEntry(self):
         assert self.student.student_id in self.app['students'].keys()
-        self.importer.delEntry(dict(reg_number=self.student.reg_number), self.app)
+        self.importer.delEntry(
+            dict(reg_number=self.student.reg_number), self.app)
         assert self.student.student_id not in self.app['students'].keys()
 
@@ -165,4 +178,13 @@
         num, num_warns, fin_file, fail_file = self.importer.doImport(
             self.csv_file_update, STUDENT_HEADER_FIELDS_UPDATE, 'update')
+        self.assertEqual(num_warns,0)
+        shutil.rmtree(os.path.dirname(fin_file))
+
+    def test_import_update2(self):
+        num, num_warns, fin_file, fail_file = self.importer.doImport(
+            self.csv_file, STUDENT_HEADER_FIELDS)
+        shutil.rmtree(os.path.dirname(fin_file))
+        num, num_warns, fin_file, fail_file = self.importer.doImport(
+            self.csv_file_update2, STUDENT_HEADER_FIELDS_UPDATE2, 'update')
         self.assertEqual(num_warns,0)
         shutil.rmtree(os.path.dirname(fin_file))
@@ -193,5 +215,6 @@
         self.workdir = tempfile.mkdtemp()
         self.importer = StudentStudyCourseProcessor()
-        self.csv_file = os.path.join(self.workdir, 'sample_studycourse_data.csv')
+        self.csv_file = os.path.join(
+            self.workdir, 'sample_studycourse_data.csv')
         open(self.csv_file, 'wb').write(STUDYCOURSE_SAMPLE_DATA)
 
