Skip to content

Commit 14c748d

Browse files
levkowetzlevkowetz
committed
Changed the creation of temporary test dirs to use names which include the test class name, in order to make it possible to run test cases in parallel. Disabled coverage testing when running in parallel (those classes cannot be pickled and distributed to the test runner threads, and also won't pass coverage data back). Tweaked the TestCase.tempdir() method.
 - Legacy-Id: 13157
1 parent 6110b15 commit 14c748d

22 files changed

Lines changed: 47 additions & 97 deletions

‎ietf/doc/tests.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,7 @@ class DocDraftTestCase(TestCase):
422422
"""
423423

424424
def setUp(self):
425-
self.id_dir = os.path.abspath("tmp-id-dir")
426-
if not os.path.exists(self.id_dir):
427-
os.mkdir(self.id_dir)
425+
self.id_dir = self.tempdir('id')
428426
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
429427
settings.INTERNET_DRAFT_PATH = self.id_dir
430428
self.saved_internet_all_drafts_archive_dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR

‎ietf/doc/tests_charter.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525

2626
class EditCharterTests(TestCase):
2727
def setUp(self):
28-
self.charter_dir = os.path.abspath("tmp-charter-dir")
29-
os.mkdir(self.charter_dir)
28+
self.charter_dir = self.tempdir('charter')
3029
self.saved_charter_path = settings.CHARTER_PATH
3130
settings.CHARTER_PATH = self.charter_dir
3231

‎ietf/doc/tests_conflict_review.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,7 @@ def test_subsequent_submission(self):
388388

389389
def setUp(self):
390390
make_test_data()
391-
self.test_dir = os.path.abspath("tmp-conflict-review-testdir")
392-
os.mkdir(self.test_dir)
391+
self.test_dir = self.tempdir('conflict-review')
393392
self.saved_conflict_review_path = settings.CONFLICT_REVIEW_PATH
394393
settings.CONFLICT_REVIEW_PATH = self.test_dir
395394

‎ietf/doc/tests_draft.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,8 @@ class ExpireIDsTests(TestCase):
549549
def setUp(self):
550550
self.saved_id_dir = settings.INTERNET_DRAFT_PATH
551551
self.saved_archive_dir = settings.INTERNET_DRAFT_ARCHIVE_DIR
552-
self.id_dir = os.path.abspath("tmp-id-dir")
553-
self.archive_dir = os.path.abspath("tmp-id-archive")
554-
if not os.path.exists(self.id_dir):
555-
os.mkdir(self.id_dir)
556-
if not os.path.exists(self.archive_dir):
557-
os.mkdir(self.archive_dir)
552+
self.id_dir = self.tempdir('id')
553+
self.archive_dir = self.tempdir('id-archive')
558554
os.mkdir(os.path.join(self.archive_dir, "unknown_ids"))
559555
os.mkdir(os.path.join(self.archive_dir, "deleted_tombstones"))
560556
os.mkdir(os.path.join(self.archive_dir, "expired_without_tombstone"))

‎ietf/doc/tests_material.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,17 @@
2222

2323
class GroupMaterialTests(TestCase):
2424
def setUp(self):
25-
self.materials_dir = os.path.abspath("tmp-document-dir")
26-
if not os.path.exists(self.materials_dir):
27-
os.makedirs(os.path.join(self.materials_dir, "slides"))
25+
self.materials_dir = self.tempdir("materials")
26+
self.slides_dir = os.path.join(self.materials_dir, "slides")
27+
if not os.path.exists(self.slides_dir):
28+
os.mkdir(self.slides_dir)
2829
self.saved_document_path_pattern = settings.DOCUMENT_PATH_PATTERN
2930
settings.DOCUMENT_PATH_PATTERN = self.materials_dir + "/{doc.type_id}/"
3031

31-
self.agenda_dir = os.path.abspath("tmp-agenda-dir")
32-
if not os.path.exists(self.agenda_dir):
33-
os.makedirs(os.path.join(self.agenda_dir, "42", "slides"))
32+
self.agenda_dir = self.tempdir("agenda")
33+
self.meeting_slides_dir = os.path.join(self.agenda_dir, "42", "slides")
34+
if not os.path.exists(self.meeting_slides_dir):
35+
os.makedirs(self.meeting_slides_dir)
3436
self.saved_agenda_path = settings.AGENDA_PATH
3537
settings.AGENDA_PATH = self.agenda_dir
3638

‎ietf/doc/tests_review.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@
3030

3131
class ReviewTests(TestCase):
3232
def setUp(self):
33-
self.review_dir = os.path.abspath("tmp-review-dir")
34-
if not os.path.exists(self.review_dir):
35-
os.mkdir(self.review_dir)
36-
33+
self.review_dir = self.tempdir('review')
3734
self.old_document_path_pattern = settings.DOCUMENT_PATH_PATTERN
3835
settings.DOCUMENT_PATH_PATTERN = self.review_dir + "/{doc.type_id}/"
3936

‎ietf/doc/tests_status_change.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,7 @@ def test_subsequent_submission(self):
479479

480480
def setUp(self):
481481
make_test_data()
482-
self.test_dir = os.path.abspath("tmp-status-change-testdir")
483-
if not os.path.exists(self.test_dir):
484-
os.mkdir(self.test_dir)
482+
self.test_dir = self.tempdir('status-change')
485483
self.saved_status_change_path = settings.STATUS_CHANGE_PATH
486484
settings.STATUS_CHANGE_PATH = self.test_dir
487485

‎ietf/group/tests_info.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ def group_urlreverse_list(group, viewname):
4242

4343
class GroupPagesTests(TestCase):
4444
def setUp(self):
45-
self.charter_dir = os.path.abspath("tmp-charter-dir")
46-
os.mkdir(self.charter_dir)
45+
self.charter_dir = self.tempdir('charter')
4746
self.saved_charter_path = settings.CHARTER_PATH
4847
settings.CHARTER_PATH = self.charter_dir
4948

@@ -418,8 +417,7 @@ def test_group_photos(self):
418417

419418
class GroupEditTests(TestCase):
420419
def setUp(self):
421-
self.charter_dir = os.path.abspath("tmp-charter-dir")
422-
os.mkdir(self.charter_dir)
420+
self.charter_dir = self.tempdir('charter')
423421
self.saved_charter_path = settings.CHARTER_PATH
424422
settings.CHARTER_PATH = self.charter_dir
425423

‎ietf/idindex/tests.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
class IndexTests(TestCase):
1414
def setUp(self):
15-
self.id_dir = os.path.abspath("tmp-id-dir")
16-
if not os.path.exists(self.id_dir):
17-
os.mkdir(self.id_dir)
15+
self.id_dir = self.tempdir('id')
1816
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
1917
settings.INTERNET_DRAFT_PATH = self.id_dir
2018

‎ietf/iesg/tests.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ def setUp(self):
9595
by = Person.objects.get(name="Areað Irector")
9696
date = get_agenda_date()
9797

98-
self.draft_dir = os.path.abspath("tmp-agenda-draft-dir")
99-
if not os.path.exists(self.draft_dir):
100-
os.mkdir(self.draft_dir)
98+
self.draft_dir = self.tempdir('agenda-draft')
10199
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
102100
settings.INTERNET_DRAFT_PATH = self.draft_dir
103101

0 commit comments

Comments
 (0)