From 6f285a12f4572b74fff93ff4b72f2168924bb878 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 15 Mar 2015 16:01:15 +0000 Subject: [PATCH] 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 --- ietf/doc/tests_draft.py | 6 ++++-- ietf/doc/tests_status_change.py | 3 ++- ietf/idindex/tests.py | 3 ++- ietf/iesg/tests.py | 3 ++- ietf/liaisons/tests.py | 8 +------- ietf/meeting/tests_views.py | 3 +-- ietf/secr/meetings/tests.py | 10 ++++++++-- ietf/secr/proceedings/tests.py | 8 +++++--- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py index a79ec22f1..251a3c0a8 100644 --- a/ietf/doc/tests_draft.py +++ b/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")) diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py index 2cb95b99e..734803991 100644 --- a/ietf/doc/tests_status_change.py +++ b/ietf/doc/tests_status_change.py @@ -487,7 +487,8 @@ class StatusChangeSubmitTests(TestCase): 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): diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py index 602a45ef9..c60c4cbad 100644 --- a/ietf/idindex/tests.py +++ b/ietf/idindex/tests.py @@ -13,7 +13,8 @@ from ietf.utils.test_data import make_test_data 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): diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index 5de7f6537..dfcc7d7fa 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -85,7 +85,8 @@ class IESGAgendaTests(TestCase): 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(): diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py index 274b2d559..8e06aad63 100644 --- a/ietf/liaisons/tests.py +++ b/ietf/liaisons/tests.py @@ -133,14 +133,8 @@ class LiaisonTests(TestCase): 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): diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 7d05c8a2e..56653b7aa 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -21,8 +21,7 @@ class MeetingTests(TestCase): 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)) diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index b8ff77ceb..ddba8a2e5 100644 --- a/ietf/secr/meetings/tests.py +++ b/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') diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py index ae8c3c95e..e70258956 100644 --- a/ietf/secr/proceedings/tests.py +++ b/ietf/secr/proceedings/tests.py @@ -58,11 +58,13 @@ class RecordingTestCase(TestCase): 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 @@ class BluesheetTestCase(TestCase): with open(path) as f: data = f.read() self.failUnless(doc.external_url in data) - \ No newline at end of file +