Changed tests to use our own subclassed TestCase, and changed almost all fixtures to be perma_fixtures.

 - Legacy-Id: 6320

Author: levkowetz

ietf/announcements/tests.py

@@ -1,11 +1,11 @@
 import datetime
 
 from django.conf import settings
-import django.test
 
 from ietf.utils.test_utils import SimpleUrlTestCase, canonicalize_sitemap
 from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox
+from ietf.utils import TestCase
 
 from ietf.announcements.models import ScheduledAnnouncement
 
@@ -21,7 +21,7 @@ def doCanonicalize(self, url, content):
         else:
             return content
 
-class SendScheduledAnnouncementsTestCase(django.test.TestCase):
+class SendScheduledAnnouncementsTestCase(TestCase):
     def test_send_plain_announcement(self):
         a = ScheduledAnnouncement.objects.create(
             mail_sent=False,
@@ -66,8 +66,9 @@ def test_send_mime_announcement(self):
         self.assertTrue(ScheduledAnnouncement.objects.get(id=a.id).mail_sent)
 
 
-class SendScheduledAnnouncementsTestCaseREDESIGN(django.test.TestCase):
-    fixtures = ["names"]
+class SendScheduledAnnouncementsTestCaseREDESIGN(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ["names"]
 
     def test_send_plain_announcement(self):
         make_test_data()

ietf/doc/tests.py

@@ -1,13 +1,13 @@
 import os, shutil, datetime
 
-import django.test
 from django.core.urlresolvers import reverse as urlreverse
 
 from pyquery import PyQuery
 
 from ietf.utils.mail import outbox
 from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_data import make_test_data
+from ietf.utils import TestCase
 
 from ietf.doc.models import *
 from ietf.name.models import *
@@ -23,8 +23,9 @@
 from ietf.doc.tests_status_change import *
 
 
-class SearchTestCase(django.test.TestCase):
-    fixtures = ['names']
+class SearchTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_search(self):
         draft = make_test_data()
@@ -125,8 +126,9 @@ def test_indexes(self):
         self.assertTrue(draft.title in r.content)
 
 
-class DocTestCase(django.test.TestCase):
-    fixtures = ['names']
+class DocTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_document_draft(self):
         draft = make_test_data()
@@ -248,8 +250,9 @@ def test_document_json(self):
         self.assertEqual(r.status_code, 200)
 
 
-class AddCommentTestCase(django.test.TestCase):
-    fixtures = ['names']
+class AddCommentTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_add_comment(self):
         draft = make_test_data()

ietf/doc/tests_ballot.py

@@ -3,7 +3,6 @@
 import os, shutil
 from datetime import date, timedelta, time
 
-import django.test
 from django.core.urlresolvers import reverse as urlreverse
 from django.conf import settings
 
@@ -19,9 +18,11 @@
 from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox
+from ietf.utils import TestCase
 
-class EditPositionTestCase(django.test.TestCase):
-    fixtures = ['names']
+class EditPositionTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_edit_position(self):
         draft = make_test_data()
@@ -169,8 +170,9 @@ def test_send_ballot_comment(self):
         self.assertTrue("Test!" in str(m))
 
 
-class DeferBallotTestCase(django.test.TestCase):
-    fixtures = ['names']
+class DeferBallotTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_defer_ballot(self):
         draft = make_test_data()
@@ -215,8 +217,9 @@ def test_undefer_ballot(self):
         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 BallotWriteupsTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_edit_last_call_text(self):
         draft = make_test_data()
@@ -406,8 +409,9 @@ def test_edit_approval_text(self):
         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 ApproveBallotTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_approve_ballot(self):
         draft = make_test_data()
@@ -456,8 +460,9 @@ def test_disapprove_ballot(self):
         self.assertEquals(len(outbox), mailbox_before + 3)
         self.assertTrue("NOT be published" in str(outbox[-1]))
 
-class MakeLastCallTestCase(django.test.TestCase):
-    fixtures = ['names']
+class MakeLastCallTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_make_last_call(self):
         draft = make_test_data()

ietf/doc/tests_conflict_review.py

@@ -6,7 +6,6 @@
 from textwrap import wrap
 
 
-import django.test
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
@@ -15,16 +14,17 @@
 from ietf.utils.mail import outbox
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_conflict_review import default_approval_text
+from ietf.utils import TestCase
 
 from ietf.doc.models import Document,DocEvent,NewRevisionDocEvent,BallotPositionDocEvent,TelechatDocEvent,DocAlias,State
 from ietf.name.models import StreamName
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
 
 
-class ConflictReviewTestCase(django.test.TestCase):
-
-    fixtures = ['names']
+class ConflictReviewTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_start_review(self):
 
@@ -254,9 +254,9 @@ def setUp(self):
         make_test_data()
 
 
-class ConflictReviewSubmitTestCase(django.test.TestCase):
-
-    fixtures = ['names']
+class ConflictReviewSubmitTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names',]
 
     def test_initial_submission(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')

ietf/doc/tests_draft.py

@@ -3,7 +3,6 @@
 import os, shutil
 from datetime import date, timedelta, time
 
-import django.test
 from django.core.urlresolvers import reverse as urlreverse
 from django.conf import settings
 
@@ -19,10 +18,12 @@
 from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox
+from ietf.utils import TestCase
 
 
-class ChangeStateTestCase(django.test.TestCase):
-    fixtures = ['names']
+class ChangeStateTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_change_state(self):
         draft = make_test_data()
@@ -177,8 +178,9 @@ def test_request_last_call(self):
         self.assertTrue("Last call was requested" in draft.latest_event().desc)
 
 
-class EditInfoTestCase(django.test.TestCase):
-    fixtures = ['names']
+class EditInfoTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_edit_info(self):
         draft = make_test_data()
@@ -359,8 +361,9 @@ def test_edit_consensus(self):
         self.assertEqual(draft.latest_event(ConsensusDocEvent, type="changed_consensus").consensus, True)
 
 
-class ResurrectTestCase(django.test.TestCase):
-    fixtures = ['names']
+class ResurrectTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_request_resurrect(self):
         draft = make_test_data()
@@ -426,8 +429,9 @@ def test_resurrect(self):
         self.assertEquals(len(outbox), mailbox_before + 1)
 
 
-class ExpireIDsTestCase(django.test.TestCase):
-    fixtures = ['names']
+class ExpireIDsTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def setUp(self):
         self.id_dir = os.path.abspath("tmp-id-dir")
@@ -608,8 +612,9 @@ def test_clean_up_draft_files(self):
         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 ExpireLastCallTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_expire_last_call(self):
         from ietf.doc.lastcall import get_expired_last_calls, expire_last_call
@@ -657,9 +662,9 @@ def test_expire_last_call(self):
         self.assertEquals(len(outbox), mailbox_before + 1)
         self.assertTrue("Last Call Expired" in outbox[-1]["Subject"])
 
-class IndividualInfoFormsTestCase(django.test.TestCase):
-
-    fixtures = ['names']
+class IndividualInfoFormsTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_doc_change_stream(self):
         url = urlreverse('doc_change_stream', kwargs=dict(name=self.docname))
@@ -885,8 +890,9 @@ def setUp(self):
         self.docname='draft-ietf-mars-test'
         self.doc = Document.objects.get(name=self.docname)
 
-class SubmitToIesgTestCase(django.test.TestCase):
-    fixtures = ['names']
+class SubmitToIesgTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def verify_permissions(self):
 
@@ -945,8 +951,9 @@ def setUp(self):
         self.doc = Document.objects.get(name=self.docname)
         self.doc.unset_state('draft-iesg') 
 
-class RequestPublicationTestCase(django.test.TestCase):
-    fixtures = ['names']
+class RequestPublicationTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_request_publication(self):
         draft = make_test_data()

ietf/doc/tests_status_change.py

@@ -6,7 +6,6 @@
 from textwrap import wrap
 
 
-import django.test
 from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
@@ -15,16 +14,17 @@
 from ietf.utils.mail import outbox
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_status_change import default_approval_text
+from ietf.utils import TestCase
 
 from ietf.doc.models import Document,DocEvent,NewRevisionDocEvent,BallotPositionDocEvent,TelechatDocEvent,WriteupDocEvent,DocAlias,State
 from ietf.name.models import StreamName
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
 
 
-class StatusChangeTestCase(django.test.TestCase):
-
-    fixtures = ['names']
+class StatusChangeTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_start_review(self):
 
@@ -353,9 +353,9 @@ def setUp(self):
         make_test_data()
 
 
-class StatusChangeSubmitTestCase(django.test.TestCase):
-
-    fixtures = ['names']
+class StatusChangeSubmitTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def test_initial_submission(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')

ietf/group/tests/__init__.py

@@ -5,7 +5,7 @@
 """
 
 import sys
-from django.test import TestCase
+from ietf.utils import TestCase
 from datetime import datetime
 
 # actual tests are distributed among a set of files in subdir tests/

ietf/group/tests/workinggroups.py

@@ -1,9 +1,11 @@
 import sys
-from django.test import TestCase
+from ietf.utils import TestCase
 from ietf.group.models import Group
 
 class WorkingGroupTestCase(TestCase):
-    fixtures = [ 'workinggroups.json']
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    fixtures = [ 'workinggroups', ]
+    perma_fixtures = []
 
     def test_FindOneWg(self):
         one = Group.objects.filter(acronym = 'roll')

ietf/help/tests.py

@@ -5,7 +5,7 @@
 Replace these with more appropriate tests for your application.
 """
 
-from django.test import TestCase
+from ietf.utils import TestCase
 
 class SimpleTest(TestCase):
     def test_basic_addition(self):

ietf/idindex/tests.py

@@ -1,16 +1,17 @@
 import datetime, shutil
 
-import django.test
 from django.core.urlresolvers import reverse as urlreverse
 
 from ietf.utils.test_data import make_test_data
+from ietf.utils import TestCase
 
 from ietf.doc.models import *
 from ietf.idindex.index import *
 
 
-class IndexTestCase(django.test.TestCase):
-    fixtures = ['names']
+class IndexTestCase(TestCase):
+    # See ietf.utils.test_utils.TestCase for the use of perma_fixtures vs. fixtures
+    perma_fixtures = ['names']
 
     def setUp(self):
         self.id_dir = os.path.abspath("tmp-id-dir")