Skip to content

Commit e6a005d

Browse files
levkowetzlevkowetz
committed
Added a score of setting save/restores to test setup/teardown actions.
 - Legacy-Id: 11436
1 parent 3d48650 commit e6a005d

14 files changed

Lines changed: 47 additions & 5 deletions

File tree

‎ietf/doc/tests.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,17 @@ def setUp(self):
420420
self.id_dir = os.path.abspath("tmp-id-dir")
421421
if not os.path.exists(self.id_dir):
422422
os.mkdir(self.id_dir)
423+
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
423424
settings.INTERNET_DRAFT_PATH = self.id_dir
425+
self.saved_internet_all_drafts_archive_dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
424426
settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR = self.id_dir
425427
f = open(os.path.join(self.id_dir, 'draft-ietf-mars-test-01.txt'), 'w')
426428
f.write(self.draft_text)
427429
f.close()
428430

429431
def tearDown(self):
432+
settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR = self.saved_internet_all_drafts_archive_dir
433+
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
430434
shutil.rmtree(self.id_dir)
431435

432436
def test_document_draft(self):

‎ietf/doc/tests_charter.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ class EditCharterTests(TestCase):
2626
def setUp(self):
2727
self.charter_dir = os.path.abspath("tmp-charter-dir")
2828
os.mkdir(self.charter_dir)
29+
self.saved_charter_path = settings.CHARTER_PATH
2930
settings.CHARTER_PATH = self.charter_dir
3031

3132
def tearDown(self):
33+
settings.CHARTER_PATH = self.saved_charter_path
3234
shutil.rmtree(self.charter_dir)
3335

3436
def test_startstop_process(self):

‎ietf/doc/tests_conflict_review.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ def setUp(self):
391391
make_test_data()
392392
self.test_dir = os.path.abspath("tmp-conflict-review-testdir")
393393
os.mkdir(self.test_dir)
394+
self.saved_conflict_review_path = settings.CONFLICT_REVIEW_PATH
394395
settings.CONFLICT_REVIEW_PATH = self.test_dir
395396

396397
def tearDown(self):
398+
settings.CONFLICT_REVIEW_PATH = self.saved_conflict_review_path
397399
shutil.rmtree(self.test_dir)

‎ietf/doc/tests_material.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,20 @@ def setUp(self):
2525
self.materials_dir = os.path.abspath("tmp-document-dir")
2626
if not os.path.exists(self.materials_dir):
2727
os.makedirs(os.path.join(self.materials_dir, "slides"))
28+
self.saved_document_path_pattern = settings.DOCUMENT_PATH_PATTERN
2829
settings.DOCUMENT_PATH_PATTERN = self.materials_dir + "/{doc.type_id}/"
2930

30-
self.save_agenda_dir = settings.AGENDA_PATH
3131
self.agenda_dir = os.path.abspath("tmp-agenda-dir")
3232
if not os.path.exists(self.agenda_dir):
3333
os.makedirs(os.path.join(self.agenda_dir, "42", "slides"))
34+
self.saved_agenda_path = settings.AGENDA_PATH
3435
settings.AGENDA_PATH = self.agenda_dir
3536

3637
def tearDown(self):
38+
settings.DOCUMENT_PATH_PATTERN = self.saved_document_path_pattern
3739
shutil.rmtree(self.materials_dir)
40+
settings.AGENDA_PATH = self.saved_agenda_path
3841
shutil.rmtree(self.agenda_dir)
39-
settings.AGENDA_PATH = self.save_agenda_dir
4042

4143
def create_slides(self):
4244
make_test_data()

‎ietf/doc/tests_status_change.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,9 @@ def setUp(self):
484484
self.test_dir = os.path.abspath("tmp-status-change-testdir")
485485
if not os.path.exists(self.test_dir):
486486
os.mkdir(self.test_dir)
487+
self.saved_status_change_path = settings.STATUS_CHANGE_PATH
487488
settings.STATUS_CHANGE_PATH = self.test_dir
488489

489490
def tearDown(self):
491+
settings.STATUS_CHANGE_PATH = self.saved_status_change_path
490492
shutil.rmtree(self.test_dir)

‎ietf/group/tests_info.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ class GroupPagesTests(TestCase):
3434
def setUp(self):
3535
self.charter_dir = os.path.abspath("tmp-charter-dir")
3636
os.mkdir(self.charter_dir)
37+
self.saved_charter_path = settings.CHARTER_PATH
3738
settings.CHARTER_PATH = self.charter_dir
3839

3940
def tearDown(self):
41+
settings.CHARTER_PATH = self.saved_charter_path
4042
shutil.rmtree(self.charter_dir)
4143

4244
def test_active_groups(self):
@@ -381,9 +383,11 @@ class GroupEditTests(TestCase):
381383
def setUp(self):
382384
self.charter_dir = os.path.abspath("tmp-charter-dir")
383385
os.mkdir(self.charter_dir)
386+
self.saved_charter_path = settings.CHARTER_PATH
384387
settings.CHARTER_PATH = self.charter_dir
385388

386389
def tearDown(self):
390+
settings.CHARTER_PATH = self.saved_charter_path
387391
shutil.rmtree(self.charter_dir)
388392

389393
def test_create(self):
@@ -989,11 +993,11 @@ def setUp(self):
989993
expand-ames-chairs@virtual.ietf.org mars_chair@ietf.org
990994
""")
991995
self.group_alias_file.close()
992-
self.save_group_virtual_path = settings.GROUP_VIRTUAL_PATH
996+
self.saved_group_virtual_path = settings.GROUP_VIRTUAL_PATH
993997
settings.GROUP_VIRTUAL_PATH = self.group_alias_file.name
994998

995999
def tearDown(self):
996-
settings.GROUP_VIRTUAL_PATH = self.save_group_virtual_path
1000+
settings.GROUP_VIRTUAL_PATH = self.saved_group_virtual_path
9971001
os.unlink(self.group_alias_file.name)
9981002

9991003
def testAliases(self):

‎ietf/idindex/tests.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ def setUp(self):
1515
self.id_dir = os.path.abspath("tmp-id-dir")
1616
if not os.path.exists(self.id_dir):
1717
os.mkdir(self.id_dir)
18+
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
1819
settings.INTERNET_DRAFT_PATH = self.id_dir
1920

2021
def tearDown(self):
22+
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
2123
shutil.rmtree(self.id_dir)
2224

2325
def write_draft_file(self, name, size):

‎ietf/iesg/tests.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ def setUp(self):
9696
self.draft_dir = os.path.abspath("tmp-agenda-draft-dir")
9797
if not os.path.exists(self.draft_dir):
9898
os.mkdir(self.draft_dir)
99+
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
99100
settings.INTERNET_DRAFT_PATH = self.draft_dir
100101

101102
for d in self.telechat_docs.values():
@@ -107,6 +108,7 @@ def setUp(self):
107108

108109

109110
def tearDown(self):
111+
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
110112
shutil.rmtree(self.draft_dir)
111113

112114
def test_fill_in_agenda_docs(self):

‎ietf/liaisons/tests.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,14 @@ def test_remind_update_sdo_list(self):
320320

321321
class LiaisonManagementTests(TestCase):
322322
def setUp(self):
323+
self.saved_liaison_attach_path = settings.LIAISON_ATTACH_PATH
323324
self.liaison_dir = os.path.abspath("tmp-liaison-dir")
324325
if not os.path.exists(self.liaison_dir):
325326
os.mkdir(self.liaison_dir)
326327
settings.LIAISON_ATTACH_PATH = self.liaison_dir
327328

328329
def tearDown(self):
330+
settings.LIAISON_ATTACH_PATH = self.saved_liaison_attach_path
329331
shutil.rmtree(self.liaison_dir)
330332

331333
def test_add_restrictions(self):

‎ietf/meeting/tests_views.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ def setUp(self):
3434
self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
3535
if not os.path.exists(self.materials_dir):
3636
os.mkdir(self.materials_dir)
37+
self.saved_agenda_path = settings.AGENDA_PATH
3738
settings.AGENDA_PATH = self.materials_dir
3839

3940
def tearDown(self):
41+
settings.AGENDA_PATH = self.saved_agenda_path
4042
shutil.rmtree(self.materials_dir)
4143

4244
def write_materials_file(self, meeting, doc, content):
@@ -465,9 +467,11 @@ def setUp(self):
465467
self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
466468
if not os.path.exists(self.materials_dir):
467469
os.mkdir(self.materials_dir)
470+
self.saved_agenda_path = settings.AGENDA_PATH
468471
settings.AGENDA_PATH = self.materials_dir
469472

470473
def tearDown(self):
474+
settings.AGENDA_PATH = self.saved_agenda_path
471475
shutil.rmtree(self.materials_dir)
472476

473477
def check_interim_tabs(self, url):

0 commit comments

Comments
 (0)