Skip to content

Commit e6eba23

Browse files
rouiljrouilj
committed
assert_ is depricated. Replacing with assertTrue to reduce logs in travisci.
1 parent 673cc07 commit e6eba23

File tree

10 files changed

+95
-95
lines changed

10 files changed

+95
-95
lines changed

‎test/db_test_base.py‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ def testRetire(self):
674674
self.assertEqual(set(self.db.status.getnodeids(retired=False)),
675675
set(others))
676676

677-
self.assert_(self.db.status.is_retired('1'))
677+
self.assertTrue(self.db.status.is_retired('1'))
678678

679679
# make sure the list is different
680680
self.assertNotEqual(a, self.db.status.list())
@@ -683,14 +683,14 @@ def testRetire(self):
683683
self.assertEqual(self.db.status.get('1', 'name'), b)
684684
self.assertRaises(IndexError, self.db.status.set, '1', name='hello')
685685
self.db.commit()
686-
self.assert_(self.db.status.is_retired('1'))
686+
self.assertTrue(self.db.status.is_retired('1'))
687687
self.assertEqual(self.db.status.get('1', 'name'), b)
688688
self.assertNotEqual(a, self.db.status.list())
689689

690690
# try to restore retired node
691691
self.db.status.restore('1')
692692

693-
self.assert_(not self.db.status.is_retired('1'))
693+
self.assertTrue(not self.db.status.is_retired('1'))
694694

695695
def testCacheCreateSet(self):
696696
self.db.issue.create(title="spam", status='1')
@@ -1451,7 +1451,7 @@ def testFileClassReindexing(self):
14511451
i1 = self.db.issue.create(files=[f1, f2])
14521452
self.db.commit()
14531453
d = self.db.indexer.search(['hello'], self.db.issue)
1454-
self.assert_(i1 in d)
1454+
self.assertTrue(i1 in d)
14551455
d[i1]['files'].sort()
14561456
self.assertEquals(d, {i1: {'files': [f1, f2]}})
14571457
self.assertEquals(self.db.indexer.search(['world'], self.db.issue),
@@ -2590,14 +2590,14 @@ def dummy_snd(s, to, msg, res=res) :
25902590
db.issue.nosymessage(i, m, {})
25912591
mail_msg = str(res["mail_msg"])
25922592
self.assertEqual(res["mail_to"], ["[email protected]"])
2593-
self.assert_("From: admin" in mail_msg)
2594-
self.assert_("Subject: [issue1] spam" in mail_msg)
2595-
self.assert_("New submission from admin" in mail_msg)
2596-
self.assert_("one two" in mail_msg)
2597-
self.assert_("File 'test1.txt' not attached" not in mail_msg)
2598-
self.assert_(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2599-
self.assert_("File 'test2.txt' not attached" in mail_msg)
2600-
self.assert_(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
2593+
self.assertTrue("From: admin" in mail_msg)
2594+
self.assertTrue("Subject: [issue1] spam" in mail_msg)
2595+
self.assertTrue("New submission from admin" in mail_msg)
2596+
self.assertTrue("one two" in mail_msg)
2597+
self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2598+
self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2599+
self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2600+
self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
26012601
finally :
26022602
roundupdb._ = old_translate_
26032603
Mailer.smtp_send = backup
@@ -2623,12 +2623,12 @@ def dummy_snd(s, to, msg, res=res) :
26232623
db.issue.nosymessage(i, m, {})
26242624
mail_msg = str(res["mail_msg"])
26252625
self.assertEqual(res["mail_to"], ["[email protected]"])
2626-
self.assert_("From: admin" in mail_msg)
2627-
self.assert_("Subject: [issue1] spam" in mail_msg)
2628-
self.assert_("New submission from admin" in mail_msg)
2629-
self.assert_("one two" in mail_msg)
2630-
self.assert_("Hello world" in mail_msg)
2631-
self.assert_(b2s(base64.encodestring(b"\x01\x02\x03\xfe\xff")).rstrip() in mail_msg)
2626+
self.assertTrue("From: admin" in mail_msg)
2627+
self.assertTrue("Subject: [issue1] spam" in mail_msg)
2628+
self.assertTrue("New submission from admin" in mail_msg)
2629+
self.assertTrue("one two" in mail_msg)
2630+
self.assertTrue("Hello world" in mail_msg)
2631+
self.assertTrue(b2s(base64.encodestring(b"\x01\x02\x03\xfe\xff")).rstrip() in mail_msg)
26322632
finally :
26332633
roundupdb._ = old_translate_
26342634
Mailer.smtp_send = backup
@@ -2667,14 +2667,14 @@ def dummy_snd(s, to, msg, res=res) :
26672667
self.assertEqual(res[0]["mail_to"], ["[email protected]"])
26682668
self.assertEqual(res[1]["mail_to"], ["[email protected]"])
26692669
mail_msg = str(res[0]["mail_msg"])
2670-
self.assert_("From: admin" in mail_msg)
2671-
self.assert_("Subject: [issue1] spam" in mail_msg)
2672-
self.assert_("New submission from admin" in mail_msg)
2673-
self.assert_("one two" in mail_msg)
2674-
self.assert_("File 'test1.txt' not attached" not in mail_msg)
2675-
self.assert_(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2676-
self.assert_("File 'test2.txt' not attached" in mail_msg)
2677-
self.assert_(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
2670+
self.assertTrue("From: admin" in mail_msg)
2671+
self.assertTrue("Subject: [issue1] spam" in mail_msg)
2672+
self.assertTrue("New submission from admin" in mail_msg)
2673+
self.assertTrue("one two" in mail_msg)
2674+
self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2675+
self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2676+
self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2677+
self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
26782678
mail_msg = str(res[1]["mail_msg"])
26792679
parts = message_from_string(mail_msg).get_payload()
26802680
self.assertEqual(len(parts),2)
@@ -2685,15 +2685,15 @@ def dummy_snd(s, to, msg, res=res) :
26852685
res = ctx.op_decrypt(crypt, plain)
26862686
self.assertEqual(res, None)
26872687
plain.seek(0,0)
2688-
self.assert_("From: admin" in mail_msg)
2689-
self.assert_("Subject: [issue1] spam" in mail_msg)
2688+
self.assertTrue("From: admin" in mail_msg)
2689+
self.assertTrue("Subject: [issue1] spam" in mail_msg)
26902690
mail_msg = str(message_from_bytes(plain.read()))
2691-
self.assert_("New submission from admin" in mail_msg)
2692-
self.assert_("one two" in mail_msg)
2693-
self.assert_("File 'test1.txt' not attached" not in mail_msg)
2694-
self.assert_(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2695-
self.assert_("File 'test2.txt' not attached" in mail_msg)
2696-
self.assert_(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
2691+
self.assertTrue("New submission from admin" in mail_msg)
2692+
self.assertTrue("one two" in mail_msg)
2693+
self.assertTrue("File 'test1.txt' not attached" not in mail_msg)
2694+
self.assertTrue(b2s(base64.encodestring(s2b("xxx"))).rstrip() in mail_msg)
2695+
self.assertTrue("File 'test2.txt' not attached" in mail_msg)
2696+
self.assertTrue(b2s(base64.encodestring(s2b("yyy"))).rstrip() not in mail_msg)
26972697
finally :
26982698
roundupdb._ = old_translate_
26992699
Mailer.smtp_send = backup
@@ -2750,7 +2750,7 @@ def test_fileClassProps(self):
27502750
self.open_database()
27512751
a = self.module.FileClass(self.db, 'a')
27522752
l = sorted(a.getprops().keys())
2753-
self.assert_(l, ['activity', 'actor', 'content', 'created',
2753+
self.assertTrue(l, ['activity', 'actor', 'content', 'created',
27542754
'creation', 'type'])
27552755

27562756
def init_ab(self):
@@ -2816,8 +2816,8 @@ def test_modifyClass(self):
28162816
self.assertEqual(self.db.a.get(aid, 'newint'), None)
28172817
# hack - metakit can't return None for missing values, and we're not
28182818
# really checking for that behavior here anyway
2819-
self.assert_(not self.db.a.get(aid, 'newnum'))
2820-
self.assert_(not self.db.a.get(aid, 'newbool'))
2819+
self.assertTrue(not self.db.a.get(aid, 'newnum'))
2820+
self.assertTrue(not self.db.a.get(aid, 'newbool'))
28212821
self.assertEqual(self.db.a.get(aid, 'newdate'), None)
28222822
self.assertEqual(self.db.b.get(aid, 'name'), 'bear')
28232823
aid2 = self.db.a.create(name='aardvark', newstr='booz')

‎test/test_actions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def testRetireAction(self):
7373
self.client.db.security.hasPermission = true
7474
self.client._ok_message = []
7575
RetireAction(self.client).handle()
76-
self.assert_(len(self.client._ok_message) == 1)
76+
self.assertTrue(len(self.client._ok_message) == 1)
7777

7878
def testNoPermission(self):
7979
self.assertRaises(Unauthorised, RetireAction(self.client).execute)
@@ -98,7 +98,7 @@ def testRestoreAction(self):
9898
self.client.db.security.hasPermission = true
9999
self.client._ok_message = []
100100
RestoreAction(self.client).handle()
101-
self.assert_(len(self.client._ok_message) == 1)
101+
self.assertTrue(len(self.client._ok_message) == 1)
102102

103103
def testNoPermission(self):
104104
self.assertRaises(Unauthorised, RestoreAction(self.client).execute)

‎test/test_cgi.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,29 +1259,29 @@ def testSearchPermission(self):
12591259

12601260
perm = self.db.security.hasPermission
12611261
search = self.db.security.hasSearchPermission
1262-
self.assert_(perm('View', chef, 'iss', 'department', '1'))
1263-
self.assert_(perm('View', chef, 'iss', 'department', '2'))
1264-
self.assert_(perm('View', chef, 'iss', 'department', '3'))
1265-
self.assert_(search(chef, 'iss', 'department'))
1262+
self.assertTrue(perm('View', chef, 'iss', 'department', '1'))
1263+
self.assertTrue(perm('View', chef, 'iss', 'department', '2'))
1264+
self.assertTrue(perm('View', chef, 'iss', 'department', '3'))
1265+
self.assertTrue(search(chef, 'iss', 'department'))
12661266

1267-
self.assert_(not perm('View', mary, 'iss', 'department'))
1268-
self.assert_(perm('View', mary, 'iss', 'status'))
1267+
self.assertTrue(not perm('View', mary, 'iss', 'department'))
1268+
self.assertTrue(perm('View', mary, 'iss', 'status'))
12691269
# Conditionally allow view of whole iss (check is False here,
12701270
# this might check for department owner in the real world)
12711271
p = self.db.security.addPermission(name='View', klass='iss',
12721272
check=lambda x,y,z: False)
12731273
self.db.security.addPermissionToRole('User', p)
1274-
self.assert_(perm('View', mary, 'iss', 'department'))
1275-
self.assert_(not perm('View', mary, 'iss', 'department', '1'))
1276-
self.assert_(not search(mary, 'iss', 'department'))
1274+
self.assertTrue(perm('View', mary, 'iss', 'department'))
1275+
self.assertTrue(not perm('View', mary, 'iss', 'department', '1'))
1276+
self.assertTrue(not search(mary, 'iss', 'department'))
12771277

1278-
self.assert_(perm('View', mary, 'iss', 'status'))
1279-
self.assert_(not search(mary, 'iss', 'status'))
1278+
self.assertTrue(perm('View', mary, 'iss', 'status'))
1279+
self.assertTrue(not search(mary, 'iss', 'status'))
12801280
# Allow user to search for iss.status
12811281
p = self.db.security.addPermission(name='Search', klass='iss',
12821282
properties=("status",))
12831283
self.db.security.addPermissionToRole('User', p)
1284-
self.assert_(search(mary, 'iss', 'status'))
1284+
self.assertTrue(search(mary, 'iss', 'status'))
12851285

12861286
dep = {'@action':'search','columns':'id','@filter':'department',
12871287
'department':'1'}
@@ -1492,19 +1492,19 @@ def testRoles(self):
14921492
cl = self._make_client({})
14931493
self.db.user.set('1', roles='aDmin, uSer')
14941494
item = HTMLItem(cl, 'user', '1')
1495-
self.assert_(item.hasRole('Admin'))
1496-
self.assert_(item.hasRole('User'))
1497-
self.assert_(item.hasRole('AdmiN'))
1498-
self.assert_(item.hasRole('UseR'))
1499-
self.assert_(item.hasRole('UseR','Admin'))
1500-
self.assert_(item.hasRole('UseR','somethingelse'))
1501-
self.assert_(item.hasRole('somethingelse','Admin'))
1502-
self.assert_(not item.hasRole('userr'))
1503-
self.assert_(not item.hasRole('adminn'))
1504-
self.assert_(not item.hasRole(''))
1505-
self.assert_(not item.hasRole(' '))
1495+
self.assertTrue(item.hasRole('Admin'))
1496+
self.assertTrue(item.hasRole('User'))
1497+
self.assertTrue(item.hasRole('AdmiN'))
1498+
self.assertTrue(item.hasRole('UseR'))
1499+
self.assertTrue(item.hasRole('UseR','Admin'))
1500+
self.assertTrue(item.hasRole('UseR','somethingelse'))
1501+
self.assertTrue(item.hasRole('somethingelse','Admin'))
1502+
self.assertTrue(not item.hasRole('userr'))
1503+
self.assertTrue(not item.hasRole('adminn'))
1504+
self.assertTrue(not item.hasRole(''))
1505+
self.assertTrue(not item.hasRole(' '))
15061506
self.db.user.set('1', roles='')
1507-
self.assert_(not item.hasRole(''))
1507+
self.assertTrue(not item.hasRole(''))
15081508

15091509
def testCSVExport(self):
15101510
cl = self._make_client(

‎test/test_hyperdbvals.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,33 +88,33 @@ def testPassword(self):
8888
self.assertEqual(self._test('password', ''), None)
8989
self.assertEqual(self._test('password', ' a string '), 'a string')
9090
val = self._test('password', ' a string ')
91-
self.assert_(isinstance(val, password.Password))
91+
self.assertTrue(isinstance(val, password.Password))
9292
val = self._test('password', '{plaintext}a string')
93-
self.assert_(isinstance(val, password.Password))
93+
self.assertTrue(isinstance(val, password.Password))
9494
val = self._test('password', '{crypt}a string')
95-
self.assert_(isinstance(val, password.Password))
95+
self.assertTrue(isinstance(val, password.Password))
9696
s = sha1(b'a string').hexdigest()
9797
val = self._test('password', '{SHA}'+s)
98-
self.assert_(isinstance(val, password.Password))
98+
self.assertTrue(isinstance(val, password.Password))
9999
self.assertEqual(val, 'a string')
100100
self.assertRaises(hyperdb.HyperdbValueError, self._test,
101101
'password', '{fubar}a string')
102102
def testDate(self):
103103
self.assertEqual(self._test('password', ''), None)
104104
val = self._test('date', ' 2003-01-01 ')
105-
self.assert_(isinstance(val, date.Date))
105+
self.assertTrue(isinstance(val, date.Date))
106106
val = self._test('date', ' 2003/01/01 ')
107-
self.assert_(isinstance(val, date.Date))
107+
self.assertTrue(isinstance(val, date.Date))
108108
val = self._test('date', ' 2003/1/1 ')
109-
self.assert_(isinstance(val, date.Date))
109+
self.assertTrue(isinstance(val, date.Date))
110110
val = self._test('date', ' 2003-1-1 ')
111-
self.assert_(isinstance(val, date.Date))
111+
self.assertTrue(isinstance(val, date.Date))
112112
self.assertRaises(hyperdb.HyperdbValueError, self._test, 'date',
113113
'fubar')
114114
def testInterval(self):
115115
self.assertEqual(self._test('password', ''), None)
116116
val = self._test('interval', ' +1d ')
117-
self.assert_(isinstance(val, date.Interval))
117+
self.assertTrue(isinstance(val, date.Interval))
118118
self.assertRaises(hyperdb.HyperdbValueError, self._test, 'interval',
119119
'fubar')
120120
def testLink(self):

‎test/test_indexer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def test_clear(self):
105105
def test_stopwords(self):
106106
"""Test that we can find a text with a stopword in it."""
107107
stopword = "with"
108-
self.assert_(self.dex.is_stopword(stopword.upper()))
108+
self.assertTrue(self.dex.is_stopword(stopword.upper()))
109109
self.dex.add_text(('test', '1', 'bar'), '%s hello world' % stopword)
110110
self.dex.add_text(('test', '2', 'bar'), 'blah a %s world' % stopword)
111111
self.dex.add_text(('test', '3', 'bar'), 'blah Blub river')

‎test/test_mailgw.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4231,7 +4231,7 @@ def testOutlookAttachment(self):
42314231
nodeid = self._handle_mail(message)
42324232
assert not os.path.exists(SENDMAILDEBUG)
42334233
msgid = self.db.issue.get(nodeid, 'messages')[0]
4234-
self.assert_(self.db.msg.get(msgid, 'content').startswith('Hi Richard'))
4234+
self.assertTrue(self.db.msg.get(msgid, 'content').startswith('Hi Richard'))
42354235
self.assertEqual(self.db.msg.get(msgid, 'files'), ['1', '2'])
42364236
fileid = self.db.msg.get(msgid, 'files')[0]
42374237
self.assertEqual(self.db.file.get(fileid, 'type'), 'text/html')

‎test/test_multipart.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,49 +115,49 @@ def setUp(self):
115115

116116
def testMultipart(self):
117117
m = email.message_from_file(self.fp, RoundupMessage)
118-
self.assert_(m is not None)
118+
self.assertTrue(m is not None)
119119

120120
it = iter(m.get_payload())
121121

122122
# first text/plain
123123
p = next(it, None)
124-
self.assert_(p is not None)
124+
self.assertTrue(p is not None)
125125
self.assertEqual(p.get_content_type(), 'text/plain')
126126
self.assertEqual(p.get_payload(),
127127
'Hello, world!\r\n\r\nBlah blah\r\nfoo\r\n-foo\r\n')
128128

129129
# sub-multipart
130130
p = next(it, None)
131-
self.assert_(p is not None)
131+
self.assertTrue(p is not None)
132132
self.assertEqual(p.get_content_type(), 'multipart/alternative')
133133

134134
# sub-multipart text/plain
135135
qit = iter(p.get_payload())
136136
q = next(qit, None)
137-
self.assert_(q is not None)
137+
self.assertTrue(q is not None)
138138
self.assertEqual(q.get_content_type(), 'text/plain')
139139
self.assertEqual(q.get_payload(), 'Hello, world!\r\n\r\nBlah blah\r\n')
140140

141141
# sub-multipart text/html
142142
q = next(qit, None)
143-
self.assert_(q is not None)
143+
self.assertTrue(q is not None)
144144
self.assertEqual(q.get_content_type(), 'text/html')
145145
self.assertEqual(q.get_payload(), '<b>Hello, world!</b>\r\n')
146146

147147
# sub-multipart end
148148
q = next(qit, None)
149-
self.assert_(q is None)
149+
self.assertTrue(q is None)
150150

151151
# final text/plain
152152
p = next(it, None)
153-
self.assert_(p is not None)
153+
self.assertTrue(p is not None)
154154
self.assertEqual(p.get_content_type(), 'text/plain')
155155
self.assertEqual(p.get_payload(),
156156
'Last bit\n')
157157

158158
# end
159159
p = next(it, None)
160-
self.assert_(p is None)
160+
self.assertTrue(p is None)
161161

162162
def TestExtraction(self, spec, expected, convert_html_with=False):
163163
if convert_html_with:

‎test/test_schema.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def tearDown(self):
4141

4242
def testA_Status(self):
4343
status = back_anydbm.Class(self.db, "status", name=String())
44-
self.assert_(status, 'no class object generated')
44+
self.assertTrue(status, 'no class object generated')
4545
status.setkey("name")
4646
val = status.create(name="unread")
4747
self.assertEqual(val, '1', 'expecting "1"')
@@ -64,12 +64,12 @@ def testA_Status(self):
6464
def testB_Issue(self):
6565
issue = back_anydbm.Class(self.db, "issue", title=String(),
6666
status=Link("status"))
67-
self.assert_(issue, 'no class object returned')
67+
self.assertTrue(issue, 'no class object returned')
6868

6969
def testC_User(self):
7070
user = back_anydbm.Class(self.db, "user", username=String(),
7171
password=Password())
72-
self.assert_(user, 'no class object returned')
72+
self.assertTrue(user, 'no class object returned')
7373
user.setkey("username")
7474

7575
# vim: set filetype=python sts=4 sw=4 et si :

‎test/test_security.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def testAdmin(self):
5959
u1 = self.db.user.create(username='one', roles='Admin')
6060
u2 = self.db.user.create(username='two', roles='User')
6161

62-
self.assert_(self.db.security.hasPermission('Edit', u1, None))
63-
self.assert_(not self.db.security.hasPermission('Edit', u2, None))
62+
self.assertTrue(self.db.security.hasPermission('Edit', u1, None))
63+
self.assertTrue(not self.db.security.hasPermission('Edit', u2, None))
6464

6565

6666
def testGetPermission(self):

0 commit comments

Comments
 (0)