Fixed a number of tests to deal correctly with model method caching.

 - Legacy-Id: 15009

Author: levkowetz

ietf/doc/tests_ballot.py

@@ -60,6 +60,7 @@ def test_edit_position(self):
         r = self.client.post(url, dict(position="noobj"))
         self.assertEqual(r.status_code, 302)
 
+        draft = Document.objects.get(name=draft.name)
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "noobj")
         self.assertEqual(draft.docevent_set.count(), events_before + 1)
@@ -70,6 +71,7 @@ def test_edit_position(self):
         r = self.client.post(url, dict(position="norecord"))
         self.assertEqual(r.status_code, 302)
 
+        draft = Document.objects.get(name=draft.name)
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "norecord")
         self.assertEqual(draft.docevent_set.count(), events_before + 1)
@@ -80,6 +82,7 @@ def test_edit_position(self):
         r = self.client.post(url, dict(position="norecord", comment="New comment."))
         self.assertEqual(r.status_code, 302)
 
+        draft = Document.objects.get(name=draft.name)
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "norecord")
         self.assertEqual(draft.docevent_set.count(), events_before + 2)
@@ -121,6 +124,7 @@ def test_api_set_position(self):
         r = self.client.post(url, dict(apikey=apikey.hash(), doc=draft.name, position="noobj"))
         self.assertEqual(r.status_code, 200)
 
+        draft = Document.objects.get(name=draft.name)
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "noobj")
         self.assertEqual(draft.docevent_set.count(), events_before + 1)
@@ -131,6 +135,7 @@ def test_api_set_position(self):
         r = self.client.post(url, dict(apikey=apikey.hash(), doc=draft.name, position="norecord"))
         self.assertEqual(r.status_code, 200)
 
+        draft = Document.objects.get(name=draft.name)
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "norecord")
         self.assertEqual(draft.docevent_set.count(), events_before + 1)
@@ -141,6 +146,7 @@ def test_api_set_position(self):
         r = self.client.post(url, dict(apikey=apikey.hash(), doc=draft.name, position="norecord", comment="New comment."))
         self.assertEqual(r.status_code, 200)
 
+        draft = Document.objects.get(name=draft.name)
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "norecord")
         self.assertEqual(draft.docevent_set.count(), events_before + 2)
@@ -428,13 +434,15 @@ def test_edit_approval_text(self):
         # test regenerate
         r = self.client.post(url, dict(regenerate_approval_text="1"))
         self.assertEqual(r.status_code, 200)
+        draft = Document.objects.get(name=draft.name)        
         self.assertTrue("Subject: Protocol Action" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text)
 
         # test regenerate when it's a disapprove
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="nopubadw"))
 
         r = self.client.post(url, dict(regenerate_approval_text="1"))
         self.assertEqual(r.status_code, 200)
+        draft = Document.objects.get(name=draft.name)
         self.assertTrue("NOT be published" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text)
 
         # test regenerate when it's a conflict review

ietf/doc/tests_charter.py

@@ -508,6 +508,7 @@ def test_edit_review_announcement_text(self):
                 regenerate_text="1"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
+        charter = Document.objects.get(name=charter.name)
         self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_review_announcement").text)
         self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_new_work_text").text)
 
@@ -530,6 +531,7 @@ def test_edit_action_announcement_text(self):
                 announcement_text="This is a simple test.",
                 save_text="1"))
         self.assertEqual(r.status_code, 302)
+        charter = Document.objects.get(name=charter.name)
         self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_action_announcement").text)
 
         # test regenerate
@@ -538,6 +540,7 @@ def test_edit_action_announcement_text(self):
                 regenerate_text="1"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
+        charter = Document.objects.get(name=charter.name)
         self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_action_announcement").text)
 
     def test_edit_ballot_writeupnotes(self):