Skip to content

Commit c191a69

Browse files
committed
Remove "names" fixture from all tests, since it's now loaded once just
after creating the test database through the global test fixture mechanism - this speeds up multiple tests considerably - Legacy-Id: 6305
1 parent f13837e commit c191a69

26 files changed

Lines changed: 38 additions & 399 deletions

File tree

ietf/announcements/tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ def test_send_mime_announcement(self):
6767

6868

6969
class SendScheduledAnnouncementsTestCaseREDESIGN(django.test.TestCase):
70-
fixtures = ["names"]
71-
7270
def test_send_plain_announcement(self):
7371
make_test_data()
7472

ietf/doc/tests.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525

2626
class SearchTestCase(django.test.TestCase):
27-
fixtures = ['names']
28-
2927
def test_search(self):
3028
draft = make_test_data()
3129

@@ -126,8 +124,6 @@ def test_indexes(self):
126124

127125

128126
class DocTestCase(django.test.TestCase):
129-
fixtures = ['names']
130-
131127
def test_document_draft(self):
132128
draft = make_test_data()
133129

@@ -249,8 +245,6 @@ def test_document_json(self):
249245

250246

251247
class AddCommentTestCase(django.test.TestCase):
252-
fixtures = ['names']
253-
254248
def test_add_comment(self):
255249
draft = make_test_data()
256250
url = urlreverse('doc_add_comment', kwargs=dict(name=draft.name))

ietf/doc/tests_ballot.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
from ietf.utils.test_data import make_test_data
2121
from ietf.utils.mail import outbox
2222

23-
class EditPositionTestCase(django.test.TestCase):
24-
fixtures = ['names']
25-
23+
class EditPositionTests(django.test.TestCase):
2624
def test_edit_position(self):
2725
draft = make_test_data()
2826
url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name,
@@ -169,9 +167,7 @@ def test_send_ballot_comment(self):
169167
self.assertTrue("Test!" in str(m))
170168

171169

172-
class DeferBallotTestCase(django.test.TestCase):
173-
fixtures = ['names']
174-
170+
class DeferBallotTests(django.test.TestCase):
175171
def test_defer_ballot(self):
176172
draft = make_test_data()
177173
draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva"))
@@ -215,9 +211,7 @@ def test_undefer_ballot(self):
215211
draft = Document.objects.get(name=draft.name)
216212
self.assertEquals(draft.get_state_slug("draft-iesg"), "iesg-eva")
217213

218-
class BallotWriteupsTestCase(django.test.TestCase):
219-
fixtures = ['names']
220-
214+
class BallotWriteupsTests(django.test.TestCase):
221215
def test_edit_last_call_text(self):
222216
draft = make_test_data()
223217
url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.name))
@@ -406,9 +400,7 @@ def test_edit_approval_text(self):
406400
draft = Document.objects.get(name=draft.name)
407401
self.assertTrue("Subject: Results of IETF-conflict review" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text)
408402

409-
class ApproveBallotTestCase(django.test.TestCase):
410-
fixtures = ['names']
411-
403+
class ApproveBallotTests(django.test.TestCase):
412404
def test_approve_ballot(self):
413405
draft = make_test_data()
414406
draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) # make sure it's approvable
@@ -456,9 +448,7 @@ def test_disapprove_ballot(self):
456448
self.assertEquals(len(outbox), mailbox_before + 3)
457449
self.assertTrue("NOT be published" in str(outbox[-1]))
458450

459-
class MakeLastCallTestCase(django.test.TestCase):
460-
fixtures = ['names']
461-
451+
class MakeLastCallTests(django.test.TestCase):
462452
def test_make_last_call(self):
463453
draft = make_test_data()
464454
draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="lc-req"))

ietf/doc/tests_conflict_review.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
from ietf.iesg.models import TelechatDate
2323

2424

25-
class ConflictReviewTestCase(django.test.TestCase):
26-
27-
fixtures = ['names']
28-
25+
class ConflictReviewTests(django.test.TestCase):
2926
def test_start_review(self):
3027

3128
doc = Document.objects.get(name='draft-imaginary-independent-submission')
@@ -254,10 +251,7 @@ def setUp(self):
254251
make_test_data()
255252

256253

257-
class ConflictReviewSubmitTestCase(django.test.TestCase):
258-
259-
fixtures = ['names']
260-
254+
class ConflictReviewSubmitTests(django.test.TestCase):
261255
def test_initial_submission(self):
262256
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
263257
url = urlreverse('conflict_review_submit',kwargs=dict(name=doc.name))

ietf/doc/tests_draft.py

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
from ietf.utils.mail import outbox
2323

2424

25-
class ChangeStateTestCase(django.test.TestCase):
26-
fixtures = ['names']
27-
25+
class ChangeStateTests(django.test.TestCase):
2826
def test_change_state(self):
2927
draft = make_test_data()
3028
draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="ad-eval"))
@@ -178,9 +176,7 @@ def test_request_last_call(self):
178176
self.assertTrue("Last call was requested" in draft.latest_event().desc)
179177

180178

181-
class EditInfoTestCase(django.test.TestCase):
182-
fixtures = ['names']
183-
179+
class EditInfoTests(django.test.TestCase):
184180
def test_edit_info(self):
185181
draft = make_test_data()
186182
url = urlreverse('doc_edit_info', kwargs=dict(name=draft.name))
@@ -360,9 +356,7 @@ def test_edit_consensus(self):
360356
self.assertEqual(draft.latest_event(ConsensusDocEvent, type="changed_consensus").consensus, True)
361357

362358

363-
class ResurrectTestCase(django.test.TestCase):
364-
fixtures = ['names']
365-
359+
class ResurrectTests(django.test.TestCase):
366360
def test_request_resurrect(self):
367361
draft = make_test_data()
368362
draft.set_state(State.objects.get(used=True, type="draft", slug="expired"))
@@ -427,9 +421,7 @@ def test_resurrect(self):
427421
self.assertEquals(len(outbox), mailbox_before + 1)
428422

429423

430-
class ExpireIDsTestCase(django.test.TestCase):
431-
fixtures = ['names']
432-
424+
class ExpireIDsTests(django.test.TestCase):
433425
def setUp(self):
434426
self.id_dir = os.path.abspath("tmp-id-dir")
435427
self.archive_dir = os.path.abspath("tmp-id-archive")
@@ -609,9 +601,7 @@ def test_clean_up_draft_files(self):
609601
self.assertTrue(not os.path.exists(os.path.join(self.id_dir, txt)))
610602
self.assertTrue(os.path.exists(os.path.join(self.archive_dir, "deleted_tombstones", txt)))
611603

612-
class ExpireLastCallTestCase(django.test.TestCase):
613-
fixtures = ['names']
614-
604+
class ExpireLastCallTests(django.test.TestCase):
615605
def test_expire_last_call(self):
616606
from ietf.doc.lastcall import get_expired_last_calls, expire_last_call
617607

@@ -658,10 +648,7 @@ def test_expire_last_call(self):
658648
self.assertEquals(len(outbox), mailbox_before + 1)
659649
self.assertTrue("Last Call Expired" in outbox[-1]["Subject"])
660650

661-
class IndividualInfoFormsTestCase(django.test.TestCase):
662-
663-
fixtures = ['names']
664-
651+
class IndividualInfoFormsTests(django.test.TestCase):
665652
def test_doc_change_stream(self):
666653
url = urlreverse('doc_change_stream', kwargs=dict(name=self.docname))
667654
login_testing_unauthorized(self, "secretary", url)
@@ -886,9 +873,7 @@ def setUp(self):
886873
self.docname='draft-ietf-mars-test'
887874
self.doc = Document.objects.get(name=self.docname)
888875

889-
class SubmitToIesgTestCase(django.test.TestCase):
890-
fixtures = ['names']
891-
876+
class SubmitToIesgTests(django.test.TestCase):
892877
def verify_permissions(self):
893878

894879
def verify_fail(remote_user):
@@ -946,9 +931,7 @@ def setUp(self):
946931
self.doc = Document.objects.get(name=self.docname)
947932
self.doc.unset_state('draft-iesg')
948933

949-
class RequestPublicationTestCase(django.test.TestCase):
950-
fixtures = ['names']
951-
934+
class RequestPublicationTests(django.test.TestCase):
952935
def test_request_publication(self):
953936
draft = make_test_data()
954937
draft.stream = StreamName.objects.get(slug="iab")
@@ -986,8 +969,6 @@ def test_request_publication(self):
986969
self.assertTrue(not outbox[-1]['CC'])
987970

988971
class AdoptDraftTests(django.test.TestCase):
989-
fixtures = ['names']
990-
991972
def test_adopt_document(self):
992973
draft = make_test_data()
993974
draft.stream = None
@@ -1023,8 +1004,6 @@ def test_adopt_document(self):
10231004
self.assertTrue("wgdelegate@ietf.org" in unicode(outbox[-1]))
10241005

10251006
class ChangeStreamStateTests(django.test.TestCase):
1026-
fixtures = ['names']
1027-
10281007
def test_set_tags(self):
10291008
draft = make_test_data()
10301009
draft.tags = DocTagName.objects.filter(slug="w-expert")

ietf/doc/tests_status_change.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
from ietf.iesg.models import TelechatDate
2323

2424

25-
class StatusChangeTestCase(django.test.TestCase):
26-
27-
fixtures = ['names']
28-
25+
class StatusChangeTests(django.test.TestCase):
2926
def test_start_review(self):
3027

3128
url = urlreverse('start_rfc_status_change',kwargs=dict(name=""))
@@ -353,10 +350,7 @@ def setUp(self):
353350
make_test_data()
354351

355352

356-
class StatusChangeSubmitTestCase(django.test.TestCase):
357-
358-
fixtures = ['names']
359-
353+
class StatusChangeSubmitTests(django.test.TestCase):
360354
def test_initial_submission(self):
361355
doc = Document.objects.get(name='status-change-imaginary-mid-review')
362356
url = urlreverse('status_change_submit',kwargs=dict(name=doc.name))

ietf/group/tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
from ietf.person.models import *
1515

1616
class StreamTests(django.test.TestCase):
17-
fixtures = ['names']
18-
1917
def test_stream_edit(self):
2018
make_test_data()
2119

ietf/idindex/tests.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
from ietf.idindex.index import *
1010

1111

12-
class IndexTestCase(django.test.TestCase):
13-
fixtures = ['names']
14-
12+
class IndexTests(django.test.TestCase):
1513
def setUp(self):
1614
self.id_dir = os.path.abspath("tmp-id-dir")
1715
os.mkdir(self.id_dir)

0 commit comments

Comments
 (0)