diff --git a/ietf/announcements/tests.py b/ietf/announcements/tests.py index 92bf9daa9..b09ee29e4 100644 --- a/ietf/announcements/tests.py +++ b/ietf/announcements/tests.py @@ -67,8 +67,6 @@ class SendScheduledAnnouncementsTestCase(django.test.TestCase): class SendScheduledAnnouncementsTestCaseREDESIGN(django.test.TestCase): - fixtures = ["names"] - def test_send_plain_announcement(self): make_test_data() diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index b3cea4d96..c6aee0e2d 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -24,8 +24,6 @@ from ietf.doc.tests_status_change import * class SearchTestCase(django.test.TestCase): - fixtures = ['names'] - def test_search(self): draft = make_test_data() @@ -126,8 +124,6 @@ class SearchTestCase(django.test.TestCase): class DocTestCase(django.test.TestCase): - fixtures = ['names'] - def test_document_draft(self): draft = make_test_data() @@ -249,8 +245,6 @@ class DocTestCase(django.test.TestCase): class AddCommentTestCase(django.test.TestCase): - fixtures = ['names'] - def test_add_comment(self): draft = make_test_data() url = urlreverse('doc_add_comment', kwargs=dict(name=draft.name)) diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py index 5db94a39b..82888483d 100644 --- a/ietf/doc/tests_ballot.py +++ b/ietf/doc/tests_ballot.py @@ -20,9 +20,7 @@ from ietf.utils.test_utils import login_testing_unauthorized from ietf.utils.test_data import make_test_data from ietf.utils.mail import outbox -class EditPositionTestCase(django.test.TestCase): - fixtures = ['names'] - +class EditPositionTests(django.test.TestCase): def test_edit_position(self): draft = make_test_data() url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, @@ -169,9 +167,7 @@ class EditPositionTestCase(django.test.TestCase): self.assertTrue("Test!" in str(m)) -class DeferBallotTestCase(django.test.TestCase): - fixtures = ['names'] - +class DeferBallotTests(django.test.TestCase): def test_defer_ballot(self): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) @@ -215,9 +211,7 @@ class DeferBallotTestCase(django.test.TestCase): draft = Document.objects.get(name=draft.name) self.assertEquals(draft.get_state_slug("draft-iesg"), "iesg-eva") -class BallotWriteupsTestCase(django.test.TestCase): - fixtures = ['names'] - +class BallotWriteupsTests(django.test.TestCase): def test_edit_last_call_text(self): draft = make_test_data() url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.name)) @@ -406,9 +400,7 @@ class BallotWriteupsTestCase(django.test.TestCase): draft = Document.objects.get(name=draft.name) self.assertTrue("Subject: Results of IETF-conflict review" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text) -class ApproveBallotTestCase(django.test.TestCase): - fixtures = ['names'] - +class ApproveBallotTests(django.test.TestCase): def test_approve_ballot(self): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) # make sure it's approvable @@ -456,9 +448,7 @@ class ApproveBallotTestCase(django.test.TestCase): self.assertEquals(len(outbox), mailbox_before + 3) self.assertTrue("NOT be published" in str(outbox[-1])) -class MakeLastCallTestCase(django.test.TestCase): - fixtures = ['names'] - +class MakeLastCallTests(django.test.TestCase): def test_make_last_call(self): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="lc-req")) diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py index d0ad46eb4..6ccc494ff 100644 --- a/ietf/doc/tests_conflict_review.py +++ b/ietf/doc/tests_conflict_review.py @@ -22,10 +22,7 @@ from ietf.group.models import Person from ietf.iesg.models import TelechatDate -class ConflictReviewTestCase(django.test.TestCase): - - fixtures = ['names'] - +class ConflictReviewTests(django.test.TestCase): def test_start_review(self): doc = Document.objects.get(name='draft-imaginary-independent-submission') @@ -254,10 +251,7 @@ class ConflictReviewTestCase(django.test.TestCase): make_test_data() -class ConflictReviewSubmitTestCase(django.test.TestCase): - - fixtures = ['names'] - +class ConflictReviewSubmitTests(django.test.TestCase): def test_initial_submission(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') url = urlreverse('conflict_review_submit',kwargs=dict(name=doc.name)) diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py index 5d4c873ea..ea28809dd 100644 --- a/ietf/doc/tests_draft.py +++ b/ietf/doc/tests_draft.py @@ -22,9 +22,7 @@ from ietf.utils.test_data import make_test_data from ietf.utils.mail import outbox -class ChangeStateTestCase(django.test.TestCase): - fixtures = ['names'] - +class ChangeStateTests(django.test.TestCase): def test_change_state(self): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="ad-eval")) @@ -178,9 +176,7 @@ class ChangeStateTestCase(django.test.TestCase): self.assertTrue("Last call was requested" in draft.latest_event().desc) -class EditInfoTestCase(django.test.TestCase): - fixtures = ['names'] - +class EditInfoTests(django.test.TestCase): def test_edit_info(self): draft = make_test_data() url = urlreverse('doc_edit_info', kwargs=dict(name=draft.name)) @@ -360,9 +356,7 @@ class EditInfoTestCase(django.test.TestCase): self.assertEqual(draft.latest_event(ConsensusDocEvent, type="changed_consensus").consensus, True) -class ResurrectTestCase(django.test.TestCase): - fixtures = ['names'] - +class ResurrectTests(django.test.TestCase): def test_request_resurrect(self): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft", slug="expired")) @@ -427,9 +421,7 @@ class ResurrectTestCase(django.test.TestCase): self.assertEquals(len(outbox), mailbox_before + 1) -class ExpireIDsTestCase(django.test.TestCase): - fixtures = ['names'] - +class ExpireIDsTests(django.test.TestCase): def setUp(self): self.id_dir = os.path.abspath("tmp-id-dir") self.archive_dir = os.path.abspath("tmp-id-archive") @@ -609,9 +601,7 @@ class ExpireIDsTestCase(django.test.TestCase): self.assertTrue(not os.path.exists(os.path.join(self.id_dir, txt))) self.assertTrue(os.path.exists(os.path.join(self.archive_dir, "deleted_tombstones", txt))) -class ExpireLastCallTestCase(django.test.TestCase): - fixtures = ['names'] - +class ExpireLastCallTests(django.test.TestCase): def test_expire_last_call(self): from ietf.doc.lastcall import get_expired_last_calls, expire_last_call @@ -658,10 +648,7 @@ class ExpireLastCallTestCase(django.test.TestCase): self.assertEquals(len(outbox), mailbox_before + 1) self.assertTrue("Last Call Expired" in outbox[-1]["Subject"]) -class IndividualInfoFormsTestCase(django.test.TestCase): - - fixtures = ['names'] - +class IndividualInfoFormsTests(django.test.TestCase): def test_doc_change_stream(self): url = urlreverse('doc_change_stream', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) @@ -886,9 +873,7 @@ class IndividualInfoFormsTestCase(django.test.TestCase): self.docname='draft-ietf-mars-test' self.doc = Document.objects.get(name=self.docname) -class SubmitToIesgTestCase(django.test.TestCase): - fixtures = ['names'] - +class SubmitToIesgTests(django.test.TestCase): def verify_permissions(self): def verify_fail(remote_user): @@ -946,9 +931,7 @@ class SubmitToIesgTestCase(django.test.TestCase): self.doc = Document.objects.get(name=self.docname) self.doc.unset_state('draft-iesg') -class RequestPublicationTestCase(django.test.TestCase): - fixtures = ['names'] - +class RequestPublicationTests(django.test.TestCase): def test_request_publication(self): draft = make_test_data() draft.stream = StreamName.objects.get(slug="iab") @@ -986,8 +969,6 @@ class RequestPublicationTestCase(django.test.TestCase): self.assertTrue(not outbox[-1]['CC']) class AdoptDraftTests(django.test.TestCase): - fixtures = ['names'] - def test_adopt_document(self): draft = make_test_data() draft.stream = None @@ -1023,8 +1004,6 @@ class AdoptDraftTests(django.test.TestCase): self.assertTrue("wgdelegate@ietf.org" in unicode(outbox[-1])) class ChangeStreamStateTests(django.test.TestCase): - fixtures = ['names'] - def test_set_tags(self): draft = make_test_data() draft.tags = DocTagName.objects.filter(slug="w-expert") diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py index bcd10d181..06bc11a46 100644 --- a/ietf/doc/tests_status_change.py +++ b/ietf/doc/tests_status_change.py @@ -22,10 +22,7 @@ from ietf.group.models import Person from ietf.iesg.models import TelechatDate -class StatusChangeTestCase(django.test.TestCase): - - fixtures = ['names'] - +class StatusChangeTests(django.test.TestCase): def test_start_review(self): url = urlreverse('start_rfc_status_change',kwargs=dict(name="")) @@ -353,10 +350,7 @@ class StatusChangeTestCase(django.test.TestCase): make_test_data() -class StatusChangeSubmitTestCase(django.test.TestCase): - - fixtures = ['names'] - +class StatusChangeSubmitTests(django.test.TestCase): def test_initial_submission(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') url = urlreverse('status_change_submit',kwargs=dict(name=doc.name)) diff --git a/ietf/group/tests.py b/ietf/group/tests.py index db3e326e8..2dd04fbbb 100644 --- a/ietf/group/tests.py +++ b/ietf/group/tests.py @@ -14,8 +14,6 @@ from ietf.group.models import * from ietf.person.models import * class StreamTests(django.test.TestCase): - fixtures = ['names'] - def test_stream_edit(self): make_test_data() diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py index 54e71ba17..2c25da365 100644 --- a/ietf/idindex/tests.py +++ b/ietf/idindex/tests.py @@ -9,9 +9,7 @@ from ietf.doc.models import * from ietf.idindex.index import * -class IndexTestCase(django.test.TestCase): - fixtures = ['names'] - +class IndexTests(django.test.TestCase): def setUp(self): self.id_dir = os.path.abspath("tmp-id-dir") os.mkdir(self.id_dir) diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index 3f1fbdf7a..a6302338e 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -12,50 +12,6 @@ from ietf.iesg.models import * from ietf.utils.test_utils import SimpleUrlTestCase, RealDatabaseTest, canonicalize_feed, login_testing_unauthorized class RescheduleOnAgendaTestCase(django.test.TestCase): - fixtures = ['base', 'draft'] - - def test_reschedule(self): - draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6") - draft.idinternal.telechat_date = TelechatDates.objects.all()[0].dates()[0] - draft.idinternal.agenda = True - draft.idinternal.returning_item = True - draft.idinternal.save() - - form_id = draft.idinternal.draft_id - telechat_date_before = draft.idinternal.telechat_date - - url = urlreverse('ietf.iesg.views.agenda_documents') - self.client.login(remote_user="klm") - - # normal get - r = self.client.get(url) - self.assertEquals(r.status_code, 200) - q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=%s-telechat_date]' % form_id)), 1) - self.assertEquals(len(q('form input[name=%s-clear_returning_item]' % form_id)), 1) - - # reschedule - comments_before = draft.idinternal.comments().count() - d = TelechatDates.objects.all()[0].dates()[2] - - r = self.client.post(url, { '%s-telechat_date' % form_id: d.strftime("%Y-%m-%d"), - '%s-clear_returning_item' % form_id: "1" }) - self.assertEquals(r.status_code, 200) - - # check that it moved below the right header in the DOM - d_header_pos = r.content.find("IESG telechat %s" % d.strftime("%Y-%m-%d")) - draft_pos = r.content.find(draft.filename) - self.assertTrue(d_header_pos < draft_pos) - - draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6") - self.assertEquals(draft.idinternal.telechat_date, d) - self.assertTrue(not draft.idinternal.returning_item) - self.assertEquals(draft.idinternal.comments().count(), comments_before + 1) - self.assertTrue("Telechat" in draft.idinternal.comments()[0].comment_text) - -class RescheduleOnAgendaTestCaseREDESIGN(django.test.TestCase): - fixtures = ['names'] - def test_reschedule(self): from ietf.utils.test_data import make_test_data from ietf.person.models import Person @@ -107,214 +63,7 @@ class RescheduleOnAgendaTestCaseREDESIGN(django.test.TestCase): self.assertEquals(draft.docevent_set.count(), events_before + 1) -if settings.USE_DB_REDESIGN_PROXY_CLASSES: - RescheduleOnAgendaTestCase = RescheduleOnAgendaTestCaseREDESIGN - -class ManageTelechatDatesTestCase(django.test.TestCase): - fixtures = ['base', 'draft'] - - def test_set_dates(self): - dates = TelechatDates.objects.all()[0] - url = urlreverse('ietf.iesg.views.telechat_dates') - login_testing_unauthorized(self, "klm", url) - - # normal get - r = self.client.get(url) - self.assertEquals(r.status_code, 200) - q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=date1]')), 1) - - # post - new_date = dates.date1 + timedelta(days=7) - - r = self.client.post(url, dict(date1=new_date.isoformat(), - date2=new_date.isoformat(), - date3=new_date.isoformat(), - date4=new_date.isoformat(), - )) - self.assertEquals(r.status_code, 200) - - dates = TelechatDates.objects.all()[0] - self.assertTrue(dates.date1 == new_date) - - def test_rollup_dates(self): - dates = TelechatDates.objects.all()[0] - url = urlreverse('ietf.iesg.views.telechat_dates') - login_testing_unauthorized(self, "klm", url) - - old_date2 = dates.date2 - new_date = dates.date4 + timedelta(days=14) - r = self.client.post(url, dict(rollup_dates="1")) - self.assertEquals(r.status_code, 200) - - dates = TelechatDates.objects.all()[0] - self.assertTrue(dates.date4 == new_date) - self.assertTrue(dates.date1 == old_date2) - -# class ManageTelechatDatesTestCaseREDESIGN(django.test.TestCase): -# fixtures = ['names'] - -# def test_set_dates(self): -# from ietf.utils.test_data import make_test_data -# make_test_data() - -# dates = TelechatDates.objects.all()[0] -# url = urlreverse('ietf.iesg.views.telechat_dates') -# login_testing_unauthorized(self, "secretary", url) - -# # normal get -# r = self.client.get(url) -# self.assertEquals(r.status_code, 200) -# q = PyQuery(r.content) -# self.assertEquals(len(q('form input[name=date1]')), 1) - -# # post -# new_date = dates.date1 + timedelta(days=7) - -# r = self.client.post(url, dict(date1=new_date.isoformat(), -# date2=new_date.isoformat(), -# date3=new_date.isoformat(), -# date4=new_date.isoformat(), -# )) -# self.assertEquals(r.status_code, 200) - -# dates = TelechatDates.objects.all()[0] -# self.assertTrue(dates.date1 == new_date) - -# def test_rollup_dates(self): -# from ietf.utils.test_data import make_test_data -# make_test_data() - -# dates = TelechatDates.objects.all()[0] -# url = urlreverse('ietf.iesg.views.telechat_dates') -# login_testing_unauthorized(self, "secretary", url) - -# old_date2 = dates.date2 -# new_date = dates.date4 + timedelta(days=14) -# r = self.client.post(url, dict(rollup_dates="1")) -# self.assertEquals(r.status_code, 200) - -# dates = TelechatDates.objects.all()[0] -# self.assertTrue(dates.date4 == new_date) -# self.assertTrue(dates.date1 == old_date2) - -if settings.USE_DB_REDESIGN_PROXY_CLASSES: - #ManageTelechatDatesTestCase = ManageTelechatDatesTestCaseREDESIGN - del ManageTelechatDatesTestCase - -class WorkingGroupActionsTestCase(django.test.TestCase): - fixtures = ['base', 'wgactions'] - - def setUp(self): - super(self.__class__, self).setUp() - - curdir = os.path.dirname(os.path.abspath(__file__)) - self.evaldir = os.path.join(curdir, "testdir") - os.mkdir(self.evaldir) - - src = os.path.join(curdir, "fixtures", "sieve-charter.txt") - shutil.copy(src, self.evaldir) - - settings.IESG_WG_EVALUATION_DIR = self.evaldir - - def tearDown(self): - super(self.__class__, self).tearDown() - shutil.rmtree(self.evaldir) - - - def test_working_group_actions(self): - url = urlreverse('iesg_working_group_actions') - login_testing_unauthorized(self, "klm", url) - - r = self.client.get(url) - self.assertEquals(r.status_code, 200) - q = PyQuery(r.content) - for wga in WGAction.objects.all(): - self.assertTrue(wga.group_acronym.name in r.content) - - self.assertTrue('(sieve)' in r.content) - - def test_delete_wgaction(self): - wga = WGAction.objects.all()[0] - url = urlreverse('iesg_edit_working_group_action', kwargs=dict(wga_id=wga.pk)) - login_testing_unauthorized(self, "klm", url) - - r = self.client.post(url, dict(delete="1")) - self.assertEquals(r.status_code, 302) - self.assertTrue(not WGAction.objects.filter(pk=wga.pk)) - - def test_edit_wgaction(self): - wga = WGAction.objects.all()[0] - url = urlreverse('iesg_edit_working_group_action', kwargs=dict(wga_id=wga.pk)) - login_testing_unauthorized(self, "klm", url) - - # normal get - r = self.client.get(url) - self.assertEquals(r.status_code, 200) - q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=token_name]')), 1) - self.assertEquals(len(q('form select[name=telechat_date]')), 1) - - # change - dates = TelechatDates.objects.all()[0] - token_name = IESGLogin.active_iesg().exclude(first_name=wga.token_name)[0].first_name - old = wga.pk - r = self.client.post(url, dict(status_date=dates.date1.isoformat(), - token_name=token_name, - category="23", - note="Testing.", - telechat_date=dates.date4.isoformat())) - self.assertEquals(r.status_code, 302) - - wga = WGAction.objects.get(pk=old) - self.assertEquals(wga.status_date, dates.date1) - self.assertEquals(wga.token_name, token_name) - self.assertEquals(wga.category, 23) - self.assertEquals(wga.note, "Testing.") - self.assertEquals(wga.telechat_date, dates.date4) - - def test_add_possible_wg(self): - url = urlreverse('iesg_working_group_actions') - login_testing_unauthorized(self, "klm", url) - - r = self.client.post(url, dict(add="1", - filename='sieve-charter.txt')) - self.assertEquals(r.status_code, 302) - - add_url = r['Location'] - r = self.client.get(add_url) - self.assertEquals(r.status_code, 200) - q = PyQuery(r.content) - self.assertTrue('(sieve)' in r.content) - self.assertEquals(len(q('form select[name=token_name]')), 1) - self.assertEquals(q('form input[name=status_date]')[0].get("value"), "2010-05-07") - self.assertEquals(len(q('form select[name=telechat_date]')), 1) - - wgas_before = WGAction.objects.all().count() - dates = TelechatDates.objects.all()[0] - token_name = IESGLogin.active_iesg()[0].first_name - r = self.client.post(add_url, - dict(status_date=dates.date1.isoformat(), - token_name=token_name, - category="23", - note="Testing.", - telechat_date=dates.date4.isoformat())) - self.assertEquals(r.status_code, 302) - self.assertEquals(wgas_before + 1, WGAction.objects.all().count()) - - def test_delete_possible_wg(self): - url = urlreverse('iesg_working_group_actions') - login_testing_unauthorized(self, "klm", url) - - r = self.client.post(url, dict(delete="1", - filename='sieve-charter.txt')) - self.assertEquals(r.status_code, 200) - - self.assertTrue('(sieve)' not in r.content) - class WorkingGroupActionsTestCaseREDESIGN(django.test.TestCase): - fixtures = ['names'] - def setUp(self): super(self.__class__, self).setUp() @@ -454,9 +203,6 @@ class WorkingGroupActionsTestCaseREDESIGN(django.test.TestCase): self.assertEquals(r.status_code, 200) self.assertTrue('(sieve)' not in r.content) - -if settings.USE_DB_REDESIGN_PROXY_CLASSES: - WorkingGroupActionsTestCase = WorkingGroupActionsTestCaseREDESIGN class IesgUrlTestCase(SimpleUrlTestCase): @@ -473,9 +219,6 @@ class IesgUrlTestCase(SimpleUrlTestCase): from ietf.doc.models import Document,TelechatDocEvent,State from ietf.group.models import Person class DeferUndeferTestCase(django.test.TestCase): - - fixtures=['names'] - def helper_test_defer(self,name): doc = Document.objects.get(name=name) diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py index e93c1f600..63981a0c4 100644 --- a/ietf/liaisons/tests.py +++ b/ietf/liaisons/tests.py @@ -91,9 +91,7 @@ def make_liaison_models(): return l -class LiaisonManagementTestCase(django.test.TestCase): - fixtures = ['names'] - +class LiaisonManagementTests(django.test.TestCase): def setUp(self): self.liaison_dir = os.path.abspath("tmp-liaison-dir") os.mkdir(self.liaison_dir) diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py index 0907f27a6..e921cb8cc 100644 --- a/ietf/nomcom/tests.py +++ b/ietf/nomcom/tests.py @@ -25,7 +25,7 @@ from ietf.nomcom.utils import get_nomcom_by_year class NomcomViewsTest(TestCase): """Tests to create a new nomcom""" - fixtures = ['names', 'nomcom_templates'] + fixtures = ['nomcom_templates'] def check_url_status(self, url, status): response = self.client.get(url) @@ -589,7 +589,7 @@ class NomcomViewsTest(TestCase): class NomineePositionStateSaveTest(TestCase): """Tests for the NomineePosition save override method""" - fixtures = ['names', 'nomcom_templates'] + fixtures = ['nomcom_templates'] def setUp(self): nomcom_test_data() @@ -621,7 +621,7 @@ class NomineePositionStateSaveTest(TestCase): class FeedbackTest(TestCase): - fixtures = ['names', 'nomcom_templates'] + fixtures = ['nomcom_templates'] def setUp(self): nomcom_test_data() diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py index 93accb01e..3a5848c9d 100644 --- a/ietf/secr/announcement/tests.py +++ b/ietf/secr/announcement/tests.py @@ -22,8 +22,6 @@ AD_USER='' class MainTestCase(TestCase): - fixtures = ['names'] - # ------- Test View -------- # def test_main(self): "Main Test" @@ -37,8 +35,6 @@ class DummyCase(TestCase): print name class UnauthorizedCase(TestCase): - fixtures = ['names'] - def test_unauthorized(self): "Unauthorized Test" draft = make_test_data() @@ -49,8 +45,6 @@ class UnauthorizedCase(TestCase): self.assertEquals(r.status_code, 403) class SubmitCase(TestCase): - fixtures = ['names'] - def test_invalid_submit(self): "Invalid Submit" draft = make_test_data() diff --git a/ietf/secr/areas/tests.py b/ietf/secr/areas/tests.py index d19219aa2..47d46c767 100644 --- a/ietf/secr/areas/tests.py +++ b/ietf/secr/areas/tests.py @@ -20,8 +20,6 @@ def augment_data(): by_id=0) class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" draft = make_test_data() diff --git a/ietf/secr/drafts/tests.py b/ietf/secr/drafts/tests.py index a169c89d9..eb54a1afc 100644 --- a/ietf/secr/drafts/tests.py +++ b/ietf/secr/drafts/tests.py @@ -9,8 +9,6 @@ from pyquery import PyQuery SECR_USER='secretary' class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" draft = make_test_data() @@ -24,4 +22,4 @@ class MainTestCase(TestCase): drafts = Document.objects.filter(type='draft') url = reverse('drafts_view', kwargs={'id':drafts[0].name}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) \ No newline at end of file + self.assertEquals(response.status_code, 200) diff --git a/ietf/secr/groups/tests.py b/ietf/secr/groups/tests.py index 12b217bd9..2981cef65 100644 --- a/ietf/secr/groups/tests.py +++ b/ietf/secr/groups/tests.py @@ -8,7 +8,6 @@ import debug SECR_USER='secretary' class GroupsTest(TestCase): - fixtures = ['names'] """ fixtures = [ 'acronym.json', 'area.json', diff --git a/ietf/secr/ipradmin/tests.py b/ietf/secr/ipradmin/tests.py index 5fdb3520a..07a6a9597 100644 --- a/ietf/secr/ipradmin/tests.py +++ b/ietf/secr/ipradmin/tests.py @@ -9,8 +9,6 @@ from pyquery import PyQuery SECR_USER='secretary' class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" draft = make_test_data() @@ -25,4 +23,4 @@ class MainTestCase(TestCase): url = reverse('drafts_view', kwargs={'id':drafts[0].name}) response = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEquals(response.status_code, 200) -""" \ No newline at end of file +""" diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index 223107590..61b800635 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -9,8 +9,6 @@ from pyquery import PyQuery SECR_USER='secretary' class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" url = reverse('meetings') diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py index b3c1006f4..6ecf53872 100644 --- a/ietf/secr/proceedings/tests.py +++ b/ietf/secr/proceedings/tests.py @@ -10,8 +10,6 @@ import debug SECR_USER='secretary' class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" make_test_data() diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py index e4ebf5df6..4232baf38 100644 --- a/ietf/secr/roles/tests.py +++ b/ietf/secr/roles/tests.py @@ -14,8 +14,6 @@ def augment_data(): Group.objects.create(acronym='dummy',name='Dummy Group',type_id='sdo') class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" augment_data() diff --git a/ietf/secr/rolodex/tests.py b/ietf/secr/rolodex/tests.py index 31b661602..0b8bd58c8 100644 --- a/ietf/secr/rolodex/tests.py +++ b/ietf/secr/rolodex/tests.py @@ -9,8 +9,6 @@ from pyquery import PyQuery SECR_USER='secretary' class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" url = reverse('rolodex') diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 23ae5958e..a093a8acc 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -20,8 +20,6 @@ class SreqUrlTestCase(SimpleUrlTestCase): self.doTestUrls(__file__) class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): draft = make_test_data() url = reverse('sessions') @@ -33,8 +31,6 @@ class MainTestCase(TestCase): self.failUnless(len(unsched) > 0) class SubmitRequestCase(TestCase): - fixtures = ['names'] - def test_submit_request(self): draft = make_test_data() acronym = Group.objects.all()[0].acronym @@ -70,4 +66,4 @@ class RetrievePreviousCase(TestCase): # test error if already scheduled # test get previous exists/doesn't exist # test that groups scheduled and unscheduled add up to total groups - # test locking function, access by unauthorized \ No newline at end of file + # test locking function, access by unauthorized diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py index e9e0eea99..dd60a68ef 100644 --- a/ietf/secr/telechat/tests.py +++ b/ietf/secr/telechat/tests.py @@ -15,8 +15,6 @@ def augment_data(): TelechatDate.objects.create(date=datetime.datetime.today()) class MainTestCase(TestCase): - fixtures = ['names'] - def test_main(self): "Main Test" augment_data() diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py index 11deee1cf..d7b528eea 100644 --- a/ietf/submit/tests.py +++ b/ietf/submit/tests.py @@ -19,8 +19,8 @@ from ietf.group.models import Group, Role from ietf.doc.models import * from ietf.submit.models import IdSubmissionDetail, Preapproval -class SubmitTestCase(django.test.TestCase): - fixtures = ['names', 'idsubmissionstatus'] +class SubmitTests(django.test.TestCase): + fixtures = ['idsubmissionstatus'] def setUp(self): self.staging_dir = os.path.abspath("tmp-submit-staging-dir") @@ -401,8 +401,8 @@ class SubmitTestCase(django.test.TestCase): self.assertTrue("Full URL for managing submission" in outbox[-1]["Subject"]) self.assertTrue(name in outbox[-1]["Subject"]) -class ApprovalsTestCase(django.test.TestCase): - fixtures = ['names', 'idsubmissionstatus'] +class ApprovalsTests(django.test.TestCase): + fixtures = ['idsubmissionstatus'] def test_approvals(self): make_test_data() diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py index 1814586ae..6b4243cdd 100644 --- a/ietf/sync/tests.py +++ b/ietf/sync/tests.py @@ -15,9 +15,7 @@ from ietf.sync import iana, rfceditor from pyquery import PyQuery -class IANASyncTestCase(django.test.TestCase): - fixtures = ['names'] - +class IANASyncTests(django.test.TestCase): def test_protocol_page_sync(self): draft = make_test_data() DocAlias.objects.create(name="rfc1234", document=draft) @@ -176,9 +174,7 @@ ICANN self.assertEqual(DocEvent.objects.filter(doc=draft, type="iana_review").count(), 1) -class RFCSyncTestCase(django.test.TestCase): - fixtures = ['names'] - +class RFCSyncTests(django.test.TestCase): def test_rfc_index(self): doc = make_test_data() doc.set_state(State.objects.get(used=True, type="draft-iesg", slug="rfcqueue")) @@ -367,9 +363,7 @@ class RFCSyncTestCase(django.test.TestCase): self.assertEquals(len(changed), 0) self.assertEquals(len(warnings), 0) -class DiscrepanciesTestCase(django.test.TestCase): - fixtures = ['names'] - +class DiscrepanciesTests(django.test.TestCase): def test_discrepancies(self): make_test_data() @@ -408,9 +402,7 @@ class DiscrepanciesTestCase(django.test.TestCase): r = self.client.get(urlreverse("ietf.sync.views.discrepancies")) self.assertTrue(doc.name in r.content) -class RFCEditorUndoTestCase(django.test.TestCase): - fixtures = ['names'] - +class RFCEditorUndoTests(django.test.TestCase): def test_rfceditor_undo(self): draft = make_test_data() diff --git a/ietf/wgcharter/tests.py b/ietf/wgcharter/tests.py index b6208a631..721dfb5fd 100644 --- a/ietf/wgcharter/tests.py +++ b/ietf/wgcharter/tests.py @@ -21,9 +21,7 @@ from ietf.person.models import * from ietf.iesg.models import TelechatDate from ietf.wgcharter.utils import * -class EditCharterTestCase(django.test.TestCase): - fixtures = ['names'] - +class EditCharterTests(django.test.TestCase): def setUp(self): self.charter_dir = os.path.abspath("tmp-charter-dir") os.mkdir(self.charter_dir) @@ -197,9 +195,7 @@ class EditCharterTestCase(django.test.TestCase): self.assertEquals(f.read(), "Windows line\nMac line\nUnix line\n" + utf_8_snippet) -class ApproveCharterTestCase(django.test.TestCase): - fixtures = ['names'] - +class ApproveCharterTests(django.test.TestCase): def setUp(self): self.charter_dir = os.path.abspath("tmp-charter-dir") os.mkdir(self.charter_dir) diff --git a/ietf/wginfo/tests.py b/ietf/wginfo/tests.py index 33134b233..f42c16770 100644 --- a/ietf/wginfo/tests.py +++ b/ietf/wginfo/tests.py @@ -51,8 +51,6 @@ from ietf.person.models import * from ietf.wginfo.mails import * class GroupPagesTests(django.test.TestCase): - fixtures = ["names"] - def setUp(self): self.charter_dir = os.path.abspath("tmp-charter-dir") os.mkdir(self.charter_dir) @@ -213,9 +211,7 @@ class GroupPagesTests(django.test.TestCase): self.assertEquals(r.status_code, 200) self.assertTrue(e.desc in r.content) -class WgEditTestCase(django.test.TestCase): - fixtures = ["names"] - +class WgEditTests(django.test.TestCase): def setUp(self): self.charter_dir = os.path.abspath("tmp-charter-dir") os.mkdir(self.charter_dir) @@ -413,9 +409,7 @@ class WgEditTestCase(django.test.TestCase): group = Group.objects.get(acronym=group.acronym) self.assertEquals(group.state_id, "active") -class MilestoneTestCase(django.test.TestCase): - fixtures = ["names"] - +class MilestoneTests(django.test.TestCase): def create_test_milestones(self): draft = make_test_data() @@ -820,9 +814,7 @@ class MilestoneTestCase(django.test.TestCase): self.assertTrue(m1.desc in unicode(outbox[-1])) self.assertTrue(m2.desc in unicode(outbox[-1])) -class CustomizeWorkflowTestCase(django.test.TestCase): - fixtures = ['names'] - +class CustomizeWorkflowTests(django.test.TestCase): def test_customize_workflow(self): make_test_data()