Index: /main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_helpers.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_helpers.py	(revision 8631)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_helpers.py	(revision 8632)
@@ -426,4 +426,25 @@
         return
 
+    def test_one_empty_input(self):
+        # we cope even with nearly empty input (one file with no data)
+        open(self.path1, 'wb').write('\n')
+        open(self.path2, 'wb').write('name,age\nManfred,32\n')
+        self.result_path = helpers.merge_csv_files(self.path1, self.path2)
+        contents = open(self.result_path, 'r').read()
+        self.assertEqual(
+            contents,
+            'age,name\r\n'
+            '32,Manfred\r\n')
+        return
+
+    def test_two_empty_inputs(self):
+        # we cope even with empty input (two files with no data)
+        open(self.path1, 'wb').write('\n')
+        open(self.path2, 'wb').write('\n')
+        self.result_path = helpers.merge_csv_files(self.path1, self.path2)
+        contents = open(self.result_path, 'r').read()
+        self.assertEqual(
+            contents, '\r\n')
+        return
 
 def test_suite():
