Added a score of setting save/restores to test setup/teardown actions.

- Legacy-Id: 11436
This commit is contained in:
Henrik Levkowetz 2016-06-21 07:51:02 +00:00
parent 3d48650c0d
commit e6a005dba6
14 changed files with 47 additions and 5 deletions

View file

@ -420,13 +420,17 @@ Man Expires September 22, 2015 [Page 3]
self.id_dir = os.path.abspath("tmp-id-dir")
if not os.path.exists(self.id_dir):
os.mkdir(self.id_dir)
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
settings.INTERNET_DRAFT_PATH = self.id_dir
self.saved_internet_all_drafts_archive_dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR = self.id_dir
f = open(os.path.join(self.id_dir, 'draft-ietf-mars-test-01.txt'), 'w')
f.write(self.draft_text)
f.close()
def tearDown(self):
settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR = self.saved_internet_all_drafts_archive_dir
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
shutil.rmtree(self.id_dir)
def test_document_draft(self):

View file

@ -26,9 +26,11 @@ class EditCharterTests(TestCase):
def setUp(self):
self.charter_dir = os.path.abspath("tmp-charter-dir")
os.mkdir(self.charter_dir)
self.saved_charter_path = settings.CHARTER_PATH
settings.CHARTER_PATH = self.charter_dir
def tearDown(self):
settings.CHARTER_PATH = self.saved_charter_path
shutil.rmtree(self.charter_dir)
def test_startstop_process(self):

View file

@ -391,7 +391,9 @@ class ConflictReviewSubmitTests(TestCase):
make_test_data()
self.test_dir = os.path.abspath("tmp-conflict-review-testdir")
os.mkdir(self.test_dir)
self.saved_conflict_review_path = settings.CONFLICT_REVIEW_PATH
settings.CONFLICT_REVIEW_PATH = self.test_dir
def tearDown(self):
settings.CONFLICT_REVIEW_PATH = self.saved_conflict_review_path
shutil.rmtree(self.test_dir)

View file

@ -25,18 +25,20 @@ class GroupMaterialTests(TestCase):
self.materials_dir = os.path.abspath("tmp-document-dir")
if not os.path.exists(self.materials_dir):
os.makedirs(os.path.join(self.materials_dir, "slides"))
self.saved_document_path_pattern = settings.DOCUMENT_PATH_PATTERN
settings.DOCUMENT_PATH_PATTERN = self.materials_dir + "/{doc.type_id}/"
self.save_agenda_dir = settings.AGENDA_PATH
self.agenda_dir = os.path.abspath("tmp-agenda-dir")
if not os.path.exists(self.agenda_dir):
os.makedirs(os.path.join(self.agenda_dir, "42", "slides"))
self.saved_agenda_path = settings.AGENDA_PATH
settings.AGENDA_PATH = self.agenda_dir
def tearDown(self):
settings.DOCUMENT_PATH_PATTERN = self.saved_document_path_pattern
shutil.rmtree(self.materials_dir)
settings.AGENDA_PATH = self.saved_agenda_path
shutil.rmtree(self.agenda_dir)
settings.AGENDA_PATH = self.save_agenda_dir
def create_slides(self):
make_test_data()

View file

@ -484,7 +484,9 @@ class StatusChangeSubmitTests(TestCase):
self.test_dir = os.path.abspath("tmp-status-change-testdir")
if not os.path.exists(self.test_dir):
os.mkdir(self.test_dir)
self.saved_status_change_path = settings.STATUS_CHANGE_PATH
settings.STATUS_CHANGE_PATH = self.test_dir
def tearDown(self):
settings.STATUS_CHANGE_PATH = self.saved_status_change_path
shutil.rmtree(self.test_dir)

View file

@ -34,9 +34,11 @@ class GroupPagesTests(TestCase):
def setUp(self):
self.charter_dir = os.path.abspath("tmp-charter-dir")
os.mkdir(self.charter_dir)
self.saved_charter_path = settings.CHARTER_PATH
settings.CHARTER_PATH = self.charter_dir
def tearDown(self):
settings.CHARTER_PATH = self.saved_charter_path
shutil.rmtree(self.charter_dir)
def test_active_groups(self):
@ -381,9 +383,11 @@ class GroupEditTests(TestCase):
def setUp(self):
self.charter_dir = os.path.abspath("tmp-charter-dir")
os.mkdir(self.charter_dir)
self.saved_charter_path = settings.CHARTER_PATH
settings.CHARTER_PATH = self.charter_dir
def tearDown(self):
settings.CHARTER_PATH = self.saved_charter_path
shutil.rmtree(self.charter_dir)
def test_create(self):
@ -989,11 +993,11 @@ ames-chairs@ietf.org xfilter-mars-ch
expand-ames-chairs@virtual.ietf.org mars_chair@ietf.org
""")
self.group_alias_file.close()
self.save_group_virtual_path = settings.GROUP_VIRTUAL_PATH
self.saved_group_virtual_path = settings.GROUP_VIRTUAL_PATH
settings.GROUP_VIRTUAL_PATH = self.group_alias_file.name
def tearDown(self):
settings.GROUP_VIRTUAL_PATH = self.save_group_virtual_path
settings.GROUP_VIRTUAL_PATH = self.saved_group_virtual_path
os.unlink(self.group_alias_file.name)
def testAliases(self):

View file

@ -15,9 +15,11 @@ class IndexTests(TestCase):
self.id_dir = os.path.abspath("tmp-id-dir")
if not os.path.exists(self.id_dir):
os.mkdir(self.id_dir)
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
settings.INTERNET_DRAFT_PATH = self.id_dir
def tearDown(self):
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
shutil.rmtree(self.id_dir)
def write_draft_file(self, name, size):

View file

@ -96,6 +96,7 @@ class IESGAgendaTests(TestCase):
self.draft_dir = os.path.abspath("tmp-agenda-draft-dir")
if not os.path.exists(self.draft_dir):
os.mkdir(self.draft_dir)
self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH
settings.INTERNET_DRAFT_PATH = self.draft_dir
for d in self.telechat_docs.values():
@ -107,6 +108,7 @@ class IESGAgendaTests(TestCase):
def tearDown(self):
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
shutil.rmtree(self.draft_dir)
def test_fill_in_agenda_docs(self):

View file

@ -320,12 +320,14 @@ class ManagementCommandTests(TestCase):
class LiaisonManagementTests(TestCase):
def setUp(self):
self.saved_liaison_attach_path = settings.LIAISON_ATTACH_PATH
self.liaison_dir = os.path.abspath("tmp-liaison-dir")
if not os.path.exists(self.liaison_dir):
os.mkdir(self.liaison_dir)
settings.LIAISON_ATTACH_PATH = self.liaison_dir
def tearDown(self):
settings.LIAISON_ATTACH_PATH = self.saved_liaison_attach_path
shutil.rmtree(self.liaison_dir)
def test_add_restrictions(self):

View file

@ -34,9 +34,11 @@ class MeetingTests(TestCase):
self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
if not os.path.exists(self.materials_dir):
os.mkdir(self.materials_dir)
self.saved_agenda_path = settings.AGENDA_PATH
settings.AGENDA_PATH = self.materials_dir
def tearDown(self):
settings.AGENDA_PATH = self.saved_agenda_path
shutil.rmtree(self.materials_dir)
def write_materials_file(self, meeting, doc, content):
@ -465,9 +467,11 @@ class InterimTests(TestCase):
self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
if not os.path.exists(self.materials_dir):
os.mkdir(self.materials_dir)
self.saved_agenda_path = settings.AGENDA_PATH
settings.AGENDA_PATH = self.materials_dir
def tearDown(self):
settings.AGENDA_PATH = self.saved_agenda_path
shutil.rmtree(self.materials_dir)
def check_interim_tabs(self, url):

View file

@ -50,13 +50,15 @@ def get_cert_files():
return client_test_cert_files
def build_test_public_keys_dir(obj):
obj.saved_nomcom_public_keys_dir = settings.NOMCOM_PUBLIC_KEYS_DIR
obj.nomcom_public_keys_dir = os.path.abspath("tmp-nomcom-public-keys-dir")
if not os.path.exists(obj.nomcom_public_keys_dir):
os.mkdir(obj.nomcom_public_keys_dir)
settings.NOMCOM_PUBLIC_KEYS_DIR = obj.nomcom_public_keys_dir
def clean_test_public_keys_dir(obj):
shutil.rmtree(obj.nomcom_public_keys_dir)
settings.NOMCOM_PUBLIC_KEYS_DIR = obj.saved_nomcom_public_keys_dir
shutil.rmtree(obj.nomcom_public_keys_dir)
class NomcomViewsTest(TestCase):
"""Tests to create a new nomcom"""
@ -1107,9 +1109,11 @@ class NewActiveNomComTests(TestCase):
build_test_public_keys_dir(self)
self.nc = NomComFactory.create(**nomcom_kwargs_for_year())
self.chair = self.nc.group.role_set.filter(name='chair').first().person
self.saved_days_to_expire_nomination_link = settings.DAYS_TO_EXPIRE_NOMINATION_LINK
def tearDown(self):
clean_test_public_keys_dir(self)
settings.DAYS_TO_EXPIRE_NOMINATION_LINK = self.saved_days_to_expire_nomination_link
def test_help(self):
url = reverse('nomcom_chair_help',kwargs={'year':self.nc.year()})

View file

@ -28,6 +28,7 @@ class SecrDraftsTestCase(TestCase):
os.mkdir(self.archive_dir)
settings.INTERNET_DRAFT_ARCHIVE_DIR = self.archive_dir
self.saved_idsubmit_manual_staging_dir = settings.IDSUBMIT_MANUAL_STAGING_DIR
self.manual_dir = os.path.abspath("tmp-submit-manual-dir")
os.mkdir(self.manual_dir)
settings.IDSUBMIT_MANUAL_STAGING_DIR = self.manual_dir
@ -38,6 +39,7 @@ class SecrDraftsTestCase(TestCase):
shutil.rmtree(self.manual_dir)
settings.INTERNET_DRAFT_PATH = self.saved_internet_draft_path
settings.INTERNET_DRAFT_ARCHIVE_DIR = self.saved_internet_draft_archive_dir
settings.IDSUBMIT_MANUAL_STAGING_DIR = self.saved_idsubmit_manual_staging_dir
def test_abstract(self):
draft = make_test_data()

View file

@ -21,13 +21,16 @@ class SecrMeetingTestCase(TestCase):
self.proceedings_dir = os.path.abspath("tmp-proceedings-dir")
if not os.path.exists(self.proceedings_dir):
os.mkdir(self.proceedings_dir)
self.saved_secr_proceedings_dir = settings.SECR_PROCEEDINGS_DIR
settings.SECR_PROCEEDINGS_DIR = self.proceedings_dir
self.saved_agenda_path = settings.AGENDA_PATH
settings.AGENDA_PATH = self.proceedings_dir
self.bluesheet_dir = os.path.abspath(settings.TEST_BLUESHEET_DIR)
self.bluesheet_path = os.path.join(self.bluesheet_dir,'blue_sheet.rtf')
if not os.path.exists(self.bluesheet_dir):
os.mkdir(self.bluesheet_dir)
self.saved_secr_blue_sheet_path = settings.SECR_BLUE_SHEET_PATH
settings.SECR_BLUE_SHEET_PATH = self.bluesheet_path
self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
@ -35,6 +38,9 @@ class SecrMeetingTestCase(TestCase):
os.mkdir(self.materials_dir)
def tearDown(self):
settings.SECR_PROCEEDINGS_DIR = self.saved_secr_proceedings_dir
settings.AGENDA_PATH = self.saved_agenda_path
settings.SECR_BLUE_SHEET_PATH = self.saved_secr_blue_sheet_path
shutil.rmtree(self.proceedings_dir)
shutil.rmtree(self.bluesheet_dir)
shutil.rmtree(self.materials_dir)

View file

@ -66,15 +66,19 @@ class BluesheetTestCase(TestCase):
self.proceedings_dir = os.path.abspath("tmp-proceedings-dir")
if not os.path.exists(self.proceedings_dir):
os.mkdir(self.proceedings_dir)
self.saved_agenda_path = settings.AGENDA_PATH
settings.AGENDA_PATH = self.proceedings_dir
self.interim_listing_dir = os.path.abspath("tmp-interim-listing-dir")
if not os.path.exists(self.interim_listing_dir):
os.mkdir(self.interim_listing_dir)
self.saved_secr_interim_listing_dir = settings.SECR_INTERIM_LISTING_DIR
settings.SECR_INTERIM_LISTING_DIR = self.interim_listing_dir
def tearDown(self):
settings.AGENDA_PATH = self.saved_agenda_path
shutil.rmtree(self.proceedings_dir)
settings.SECR_INTERIM_LISTING_DIR = self.saved_secr_interim_listing_dir
shutil.rmtree(self.interim_listing_dir)
def test_upload(self):