From 9b23816a22905f2873c79f4aa4a50956e2f58e62 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 13 Feb 2017 20:58:28 +0000 Subject: [PATCH] Stabilized a number of nomcom tests by enforcing queryset ordering. - Legacy-Id: 12832 --- ietf/nomcom/tests.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py index 6c9dab942..0dc9a00c3 100644 --- a/ietf/nomcom/tests.py +++ b/ietf/nomcom/tests.py @@ -1071,7 +1071,7 @@ class InactiveNomcomTests(TestCase): self.assertTrue( q('#nominees a') ) self.assertFalse( q('#nominees a[href]') ) - url += "?nominee=%d&position=%d" % (self.nc.nominee_set.first().id, self.nc.nominee_set.first().nomineeposition_set.first().position.id) + url += "?nominee=%d&position=%d" % (self.nc.nominee_set.order_by('pk').first().id, self.nc.nominee_set.order_by('pk').first().nomineeposition_set.order_by('pk').first().position.id) response = self.client.get(url) self.assertEqual(response.status_code, 200) q = PyQuery(response.content) @@ -1102,7 +1102,7 @@ class InactiveNomcomTests(TestCase): def test_acceptance_closed(self): today = datetime.date.today().strftime('%Y%m%d') - pid = self.nc.position_set.first().nomineeposition_set.first().id + pid = self.nc.position_set.first().nomineeposition_set.order_by('pk').first().id url = reverse('nomcom_process_nomination_status', kwargs = { 'year' : self.nc.year(), 'nominee_position_id' : pid, @@ -1247,7 +1247,7 @@ class FeedbackLastSeenTests(TestCase): self.nc = NomComFactory.create(**nomcom_kwargs_for_year()) self.author = PersonFactory.create().email_set.first().address self.member = self.nc.group.role_set.filter(name='member').first().person - self.nominee = self.nc.nominee_set.first() + self.nominee = self.nc.nominee_set.order_by('pk').first() self.position = self.nc.position_set.first() for type_id in ['comment','nomina','questio']: f = FeedbackFactory.create(author=self.author,nomcom=self.nc,type_id=type_id) @@ -1331,7 +1331,7 @@ class NewActiveNomComTests(TestCase): def test_accept_reject_nomination_edges(self): - np = self.nc.nominee_set.first().nomineeposition_set.first() + np = self.nc.nominee_set.order_by('pk').first().nomineeposition_set.order_by('pk').first() kwargs={'year':self.nc.year(), 'nominee_position_id':np.id, @@ -1361,7 +1361,7 @@ class NewActiveNomComTests(TestCase): self.assertTrue('Bad hash!' in unicontent(response)) def test_accept_reject_nomination_comment(self): - np = self.nc.nominee_set.first().nomineeposition_set.first() + np = self.nc.nominee_set.order_by('pk').first().nomineeposition_set.order_by('pk').first() hash = get_hash_nominee_position(np.time.strftime("%Y%m%d"),np.id) url = reverse('nomcom_process_nomination_status', kwargs={'year':self.nc.year(), @@ -1453,7 +1453,7 @@ Junk body for testing self.assertEqual(np.nominee.feedback_set.count(),fb_count_before+1) fb = FeedbackFactory(nomcom=self.nc,type_id=None) - nominee = self.nc.nominee_set.first() + nominee = self.nc.nominee_set.order_by('pk').first() position = self.nc.position_set.exclude(nomineeposition__nominee=nominee).first() self.assertIsNotNone(position) fb_count_before = nominee.feedback_set.count() @@ -1539,7 +1539,7 @@ Junk body for testing fb0 = FeedbackFactory(nomcom=self.nc,type_id=None) fb1 = FeedbackFactory(nomcom=self.nc,type_id=None) fb2 = FeedbackFactory(nomcom=self.nc,type_id=None) - nominee = self.nc.nominee_set.first() + nominee = self.nc.nominee_set.order_by('pk').first() new_position_for_nominee = self.nc.position_set.exclude(nomineeposition__nominee=nominee).first() # Initial formset @@ -1679,7 +1679,7 @@ Junk body for testing self.assertEqual(response.status_code, 404) def test_edit_nominee(self): - nominee = self.nc.nominee_set.first() + nominee = self.nc.nominee_set.order_by('pk').first() new_email = EmailFactory(person=nominee.person) url = reverse('nomcom_edit_nominee',kwargs={'year':self.nc.year(),'nominee_id':nominee.id}) login_testing_unauthorized(self,self.chair.user.username,url) @@ -1687,7 +1687,7 @@ Junk body for testing self.assertEqual(response.status_code, 200) response = self.client.post(url,{'nominee_email':new_email.address}) self.assertEqual(response.status_code, 302) - nominee = self.nc.nominee_set.first() + nominee = self.nc.nominee_set.order_by('pk').first() self.assertEqual(nominee.email,new_email) def test_request_merge(self):