Changed the handling of some test directory creation and removal code, to be more consistent. Fixed a problem where a test didn't create and remove a test directory it used.

 - Legacy-Id: 9203

Author: levkowetz

ietf/doc/tests_draft.py

@@ -469,8 +469,10 @@ class ExpireIDsTests(TestCase):
     def setUp(self):
         self.id_dir = os.path.abspath("tmp-id-dir")
         self.archive_dir = os.path.abspath("tmp-id-archive")
-        os.mkdir(self.id_dir)
-        os.mkdir(self.archive_dir)
+        if not os.path.exists(self.id_dir):
+            os.mkdir(self.id_dir)
+        if not os.path.exists(self.archive_dir):
+            os.mkdir(self.archive_dir)
         os.mkdir(os.path.join(self.archive_dir, "unknown_ids"))
         os.mkdir(os.path.join(self.archive_dir, "deleted_tombstones"))
         os.mkdir(os.path.join(self.archive_dir, "expired_without_tombstone"))

ietf/doc/tests_status_change.py

@@ -487,7 +487,8 @@ def test_subsequent_submission(self):
     def setUp(self):
         make_test_data()
         self.test_dir = os.path.abspath("tmp-status-change-testdir")
-        os.mkdir(self.test_dir)
+        if not os.path.exists(self.test_dir):
+            os.mkdir(self.test_dir)
         settings.STATUS_CHANGE_PATH = self.test_dir
 
     def tearDown(self):

ietf/idindex/tests.py

@@ -13,7 +13,8 @@
 class IndexTests(TestCase):
     def setUp(self):
         self.id_dir = os.path.abspath("tmp-id-dir")
-        os.mkdir(self.id_dir)
+        if not os.path.exists(self.id_dir):
+            os.mkdir(self.id_dir)
         settings.INTERNET_DRAFT_PATH = self.id_dir
 
     def tearDown(self):

ietf/iesg/tests.py

@@ -85,7 +85,8 @@ def setUp(self):
         date = get_agenda_date()
 
         self.draft_dir = os.path.abspath("tmp-agenda-draft-dir")
-        os.mkdir(self.draft_dir)
+        if not os.path.exists(self.draft_dir):
+            os.mkdir(self.draft_dir)
         settings.INTERNET_DRAFT_PATH = self.draft_dir
 
         for d in self.telechat_docs.values():

ietf/liaisons/tests.py

@@ -133,14 +133,8 @@ def test_help_pages(self):
 class LiaisonManagementTests(TestCase):
     def setUp(self):
         self.liaison_dir = os.path.abspath("tmp-liaison-dir")
-        try:
+        if not os.path.exists(self.liaison_dir):
             os.mkdir(self.liaison_dir)
-        except OSError, e:
-            if "File exists" in str(e):
-                pass
-            else:
-                raise
-        
         settings.LIAISON_ATTACH_PATH = self.liaison_dir
 
     def tearDown(self):

ietf/meeting/tests_views.py

@@ -21,8 +21,7 @@ def setUp(self):
         settings.AGENDA_PATH = self.materials_dir
 
     def tearDown(self):
-        if os.path.exists(self.materials_dir):
-            shutil.rmtree(self.materials_dir)
+        shutil.rmtree(self.materials_dir)
 
     def write_materials_file(self, meeting, doc, content):
         path = os.path.join(self.materials_dir, "%s/%s/%s" % (meeting.number, doc.type_id, doc.external_url))

ietf/secr/meetings/tests.py

@@ -18,12 +18,18 @@ class MainTestCase(TestCase):
     def setUp(self):
         self.bluesheet_dir = os.path.abspath(settings.TEST_BLUESHEET_DIR)
         self.bluesheet_path = os.path.join(self.bluesheet_dir,'blue_sheet.rtf')
-        os.mkdir(self.bluesheet_dir)
+        if not os.path.exists(self.bluesheet_dir):
+            os.mkdir(self.bluesheet_dir)
         settings.SECR_BLUE_SHEET_PATH = self.bluesheet_path
+
+        self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
+        if not os.path.exists(self.materials_dir):
+            os.mkdir(self.materials_dir)
 
     def tearDown(self):
         shutil.rmtree(self.bluesheet_dir)
-        
+        shutil.rmtree(self.materials_dir)
+
     def test_main(self):
         "Main Test"
         url = reverse('meetings')

ietf/secr/proceedings/tests.py

@@ -58,11 +58,13 @@ def test_post(self):
 class BluesheetTestCase(TestCase):
     def setUp(self):
         self.proceedings_dir = os.path.abspath("tmp-proceedings-dir")
-        os.mkdir(self.proceedings_dir)
+        if not os.path.exists(self.proceedings_dir):
+            os.mkdir(self.proceedings_dir)
         settings.AGENDA_PATH = self.proceedings_dir
 
         self.interim_listing_dir = os.path.abspath("tmp-interim-listing-dir")
-        os.mkdir(self.interim_listing_dir)
+        if not os.path.exists(self.interim_listing_dir):
+            os.mkdir(self.interim_listing_dir)
         settings.SECR_INTERIM_LISTING_DIR = self.interim_listing_dir
 
     def tearDown(self):
@@ -90,4 +92,4 @@ def test_upload(self):
         with open(path) as f:
             data = f.read()
         self.failUnless(doc.external_url in data)
-        
+