Skip to content

Commit 2e20d9d

Browse files
committed
Changed all instances of deprecated self.failUnless() unittest method to self.assertTrue().
- Legacy-Id: 13515
1 parent 7ae8040 commit 2e20d9d

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

ietf/doc/tests_review.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ def test_partially_complete_review(self):
716716
# than 80.
717717
body = outbox[2].get_payload(decode=True).decode("utf-8")
718718
self.assertIn('really, really, really', body)
719-
self.assertTrue(not any( len(line) > 80 for line in body.splitlines() ))
719+
self.assertTrue(all( len(line) <= 80 for line in body.splitlines() ))
720720

721721

722722
def test_revise_review_enter_content(self):

ietf/secr/groups/tests.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_search(self):
2626
response = self.client.post(url,post_data,follow=True)
2727
#assert False, response.content
2828
self.assertEqual(response.status_code, 200)
29-
self.failUnless(group.acronym in response.content)
29+
self.assertTrue(group.acronym in response.content)
3030

3131
# ------- Test Add -------- #
3232
def test_add_button(self):
@@ -47,7 +47,7 @@ def test_add_group_invalid(self):
4747
self.client.login(username="secretary", password="secretary+password")
4848
response = self.client.post(url,post_data)
4949
self.assertEqual(response.status_code, 200)
50-
self.failUnless('This field is required' in response.content)
50+
self.assertTrue('This field is required' in response.content)
5151

5252
def test_add_group_dupe(self):
5353
make_test_data()
@@ -66,7 +66,7 @@ def test_add_group_dupe(self):
6666
response = self.client.post(url,post_data)
6767
#print response.content
6868
self.assertEqual(response.status_code, 200)
69-
self.failUnless('Group with this Acronym already exists' in response.content)
69+
self.assertTrue('Group with this Acronym already exists' in response.content)
7070

7171
def test_add_group_success(self):
7272
make_test_data()
@@ -113,7 +113,7 @@ def test_edit_valid(self):
113113
self.client.login(username="secretary", password="secretary+password")
114114
response = self.client.post(url,post_data,follow=True)
115115
self.assertRedirects(response, target)
116-
self.failUnless('changed successfully' in response.content)
116+
self.assertTrue('changed successfully' in response.content)
117117

118118
def test_edit_non_wg_group(self):
119119
make_test_data()
@@ -133,7 +133,7 @@ def test_edit_non_wg_group(self):
133133
self.client.login(username="secretary", password="secretary+password")
134134
response = self.client.post(url,post_data,follow=True)
135135
self.assertRedirects(response, target)
136-
self.failUnless('changed successfully' in response.content)
136+
self.assertTrue('changed successfully' in response.content)
137137

138138
# ------- Test People -------- #
139139
def test_people_delete(self):
@@ -145,7 +145,7 @@ def test_people_delete(self):
145145
self.client.login(username="secretary", password="secretary+password")
146146
response = self.client.get(url,follow=True)
147147
self.assertRedirects(response, target)
148-
self.failUnless('deleted successfully' in response.content)
148+
self.assertTrue('deleted successfully' in response.content)
149149

150150
def test_people_add(self):
151151
make_test_data()
@@ -160,4 +160,4 @@ def test_people_add(self):
160160
self.client.login(username="secretary", password="secretary+password")
161161
response = self.client.post(url,post_data,follow=True)
162162
self.assertRedirects(response, url)
163-
self.failUnless('added successfully' in response.content)
163+
self.assertTrue('added successfully' in response.content)

ietf/secr/proceedings/tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ def test_post(self):
133133
self.client.login(username="secretary", password="secretary+password")
134134
response = self.client.post(url,data,follow=True)
135135
self.assertEqual(response.status_code, 200)
136-
self.failUnless(group.acronym in response.content)
136+
self.assertTrue(group.acronym in response.content)
137137

138138
# now test edit
139139
doc = session.materials.filter(type='recording').first()
140140
external_url = 'http://youtube.com/aaa'
141141
url = reverse('ietf.secr.proceedings.views.recording_edit', kwargs={'meeting_num':meeting.number,'name':doc.name})
142142
response = self.client.post(url,dict(external_url=external_url),follow=True)
143143
self.assertEqual(response.status_code, 200)
144-
self.failUnless(external_url in response.content)
144+
self.assertTrue(external_url in response.content)
145145

146146
def test_import_audio_files(self):
147147
meeting = make_meeting_test_data()

ietf/secr/roles/tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_roles_delete(self):
3333
self.client.login(username="secretary", password="secretary+password")
3434
response = self.client.get(url,follow=True)
3535
self.assertRedirects(response, target)
36-
self.failUnless('deleted successfully' in response.content)
36+
self.assertTrue('deleted successfully' in response.content)
3737

3838
def test_roles_add(self):
3939
make_test_data()
@@ -50,7 +50,7 @@ def test_roles_add(self):
5050
self.client.login(username="secretary", password="secretary+password")
5151
response = self.client.post(url,post_data,follow=True)
5252
self.assertRedirects(response, target)
53-
self.failUnless('added successfully' in response.content)
53+
self.assertTrue('added successfully' in response.content)
5454

5555
def test_roles_add_no_group(self):
5656
make_test_data()
@@ -65,4 +65,4 @@ def test_roles_add_no_group(self):
6565
self.client.login(username="secretary", password="secretary+password")
6666
response = self.client.post(url,post_data,follow=True)
6767
self.assertEqual(response.status_code, 200)
68-
self.failUnless('You must select a group' in response.content)
68+
self.assertTrue('You must select a group' in response.content)

0 commit comments

Comments
 (0)