Changeset 9290

Timestamp:

4 Oct 2012, 12:07:53 (12 years ago)

Author:

uli

Message:

Minor cleanups and (hopefully) last removal of a source of tempdirs in
tests. This one was really hard to find and my own fault.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -165 +165 @@
         return False
 
+    def trigger_export(self):
+        # helper to start an export. Make sure to remove the result file
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.datacenter_path)
+        self.browser.getLink("Export data").click()
+        self.browser.getControl(name="exporter").value = ['faculties']
+        self.browser.getControl("Create CSV file").click()
+        return
+
+    def cleanup_run_job(self):
+        # helper to remove any result file of an export
+        job_id = self.wait_for_export_job_completed()
+        manager = getUtility(IJobManager)
+        job = manager.get(job_id)
+        if os.path.exists(job.result):
+            shutil.rmtree(os.path.dirname(job.result))
+
     def test_export_start(self):
         # we can trigger export file creation
@@ -175 +192 @@
         self.browser.getControl("Create CSV file").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.cleanup_run_job() # make sure to remove temp dirs
         return
 
     def test_export_download(self):
         # we can download a generated export result
-        self.test_export_start()
+        self.trigger_export()
         # while the export file is created, we get a reload button
         # (or a loading bar if javascript is enabled)...
@@ -264 +282 @@
             '<option value="accesscodebatches">' in self.browser.contents)
         # ... but not the accesscodes exporter.
-        self.assertFalse('<option value="accesscodes">' in self.browser.contents)
+        self.assertFalse('<option value="accesscodes">'
+                         in self.browser.contents)
 
     def test_export_discard(self):
         # we can discard a generated export result
-        self.test_export_start()
+        self.trigger_export()
         self.wait_for_export_job_completed()
         self.browser.open(self.datacenter_path + '/@@export')
@@ -294 +313 @@
 
     def test_set_former_course(self):
-        # A certificate course will be automatically removed when 
-        # the former_course attribute of the corresponding course is set.
+        # A certificate course will be automatically removed when the
+        # former_course attribute of the corresponding course is set.
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.assertTrue(self.app['faculties']['fac1']['dep1'].certificates[
             'CERT1'].has_key('COURSE1_100'))
-        self.browser.open('http://localhost/app/faculties/fac1/dep1/courses/COURSE1/manage')
+        self.browser.open(
+            'http://localhost/app/faculties/fac1/dep1/courses/COURSE1/manage')
         self.browser.getControl(name="form.former_course").value = ['selected']
         self.browser.getControl("Save").click()