Changeset 9283 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests

Timestamp:

3 Oct 2012, 21:36:14 (12 years ago)

Author:

Henrik Bettermann

Message:

Remove temporary dirs in tests.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_batching.py (modified) (6 diffs)

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

@@ -94 +94 @@
         clearSite()
         shutil.rmtree(self.dc_root)
+        shutil.rmtree(self.workdir)
 
 class ACBatchProcessorTest(ACFullSetup):
@@ -126 +127 @@
         self.csv_file = os.path.join(self.workdir, 'sample_batch_data.csv')
         open(self.csv_file, 'wb').write(BATCH_SAMPLE_DATA)
-        self.processor.doImport(self.csv_file, BATCH_HEADER_FIELDS)
+        num, num_warns, fin_file, fail_file =  self.processor.doImport(
+            self.csv_file, BATCH_HEADER_FIELDS)
+        shutil.rmtree(os.path.dirname(fin_file))
 
         self.processor = AccessCodeProcessor()
@@ -175 +178 @@
         self.csv_file = os.path.join(self.workdir, 'sample_batch_data.csv')
         open(self.csv_file, 'wb').write(BATCH_SAMPLE_DATA)
-        self.processor.doImport(self.csv_file, BATCH_HEADER_FIELDS)
+        num, num_warns, fin_file, fail_file =  self.processor.doImport(
+            self.csv_file, BATCH_HEADER_FIELDS)
+        shutil.rmtree(os.path.dirname(fin_file))
 
         self.processor = AccessCodeProcessor()
@@ -182 +187 @@
         num, num_warns, fin_file, fail_file =  self.processor.doImport(
             self.csv_file, AC_HEADER_FIELDS)
+        shutil.rmtree(os.path.dirname(fin_file))
 
         self.assertEqual(self.app['accesscodes']['HOS-1'].used_num, 1)
@@ -192 +198 @@
         num, num_warns, fin_file, fail_file =  self.processor.doImport(
             self.csv_file, AC_HEADER_FIELDS_UPDATE, 'update')
-        fin_file = open(fin_file).read()
         self.assertEqual(num_warns,0)
         self.assertEqual(
@@ -216 +221 @@
         self.assertEqual(self.app['accesscodes']['CLR-1'].used_num, 1)
         self.assertEqual(self.app['accesscodes']['CLR-1'].disabled_num, 0)
+        shutil.rmtree(os.path.dirname(fin_file))
         return