DandelionNStuff/pymilter
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change deprecated failUnless to assertTrue

Browse Source
This commit is contained in:
Stuart D. Gathman
2018-08-05 00:34:06 -04:00
parent fc008f6db0
commit 55eb05e526
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testsample.py
+16 -16
View File
@@ -17,15 +17,15 @@ class BMSMilterTestCase(unittest.TestCase):
milter.setsymval('{auth_type}','batcomputer') milter.setsymval('{auth_type}','batcomputer')
milter.setsymval('j','mailhost') milter.setsymval('j','mailhost')
rc = milter.connect() rc = milter.connect()
self.failUnless(rc == Milter.CONTINUE) self.assertTrue(rc == Milter.CONTINUE)
rc = milter.feedMsg(fname) rc = milter.feedMsg(fname)
self.failUnless(milter.user == 'batman',"getsymval failed") self.assertTrue(milter.user == 'batman',"getsymval failed")
self.failUnless(milter.auth_type != 'batcomputer',"setsymlist failed") self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed")
self.failUnless(rc == Milter.ACCEPT) self.assertTrue(rc == Milter.ACCEPT)
self.failUnless(milter._bodyreplaced,"Message body not replaced") self.assertTrue(milter._bodyreplaced,"Message body not replaced")
fp = milter._body fp = milter._body
open('test/'+fname+".tstout","wb").write(fp.getvalue()) open('test/'+fname+".tstout","wb").write(fp.getvalue())
#self.failUnless(fp.getvalue() == open("test/virus1.out","r").read()) #self.assertTrue(fp.getvalue() == open("test/virus1.out","r").read())
fp.seek(0) fp.seek(0)
msg = mime.message_from_file(fp) msg = mime.message_from_file(fp)
s = msg.get_payload(1).get_payload() s = msg.get_payload(1).get_payload()
@@ -36,8 +36,8 @@ class BMSMilterTestCase(unittest.TestCase):
milter = TestMilter() milter = TestMilter()
milter.connect('somehost') milter.connect('somehost')
rc = milter.feedMsg(fname) rc = milter.feedMsg(fname)
self.failUnless(rc == Milter.ACCEPT) self.assertTrue(rc == Milter.ACCEPT)
self.failIf(milter._bodyreplaced,"Milter needlessly replaced body.") self.assertFalse(milter._bodyreplaced,"Milter needlessly replaced body.")
fp = milter._body fp = milter._body
open('test/'+fname+".tstout","wb").write(fp.getvalue()) open('test/'+fname+".tstout","wb").write(fp.getvalue())
milter.close() milter.close()
@@ -46,18 +46,18 @@ class BMSMilterTestCase(unittest.TestCase):
milter = TestMilter() milter = TestMilter()
milter.connect('somehost') milter.connect('somehost')
rc = milter.feedMsg('samp1') rc = milter.feedMsg('samp1')
self.failUnless(rc == Milter.ACCEPT) self.assertTrue(rc == Milter.ACCEPT)
self.failIf(milter._bodyreplaced,"Milter needlessly replaced body.") self.assertFalse(milter._bodyreplaced,"Milter needlessly replaced body.")
rc = milter.feedMsg("virus3") rc = milter.feedMsg("virus3")
self.failUnless(rc == Milter.ACCEPT) self.assertTrue(rc == Milter.ACCEPT)
self.failUnless(milter._bodyreplaced,"Message body not replaced") self.assertTrue(milter._bodyreplaced,"Message body not replaced")
fp = milter._body fp = milter._body
open("test/virus3.tstout","wb").write(fp.getvalue()) open("test/virus3.tstout","wb").write(fp.getvalue())
#self.failUnless(fp.getvalue() == open("test/virus3.out","r").read()) #self.assertTrue(fp.getvalue() == open("test/virus3.out","r").read())
rc = milter.feedMsg("virus6") rc = milter.feedMsg("virus6")
self.failUnless(rc == Milter.ACCEPT) self.assertTrue(rc == Milter.ACCEPT)
self.failUnless(milter._bodyreplaced,"Message body not replaced") self.assertTrue(milter._bodyreplaced,"Message body not replaced")
self.failUnless(milter._headerschanged,"Message headers not adjusted") self.assertTrue(milter._headerschanged,"Message headers not adjusted")
fp = milter._body fp = milter._body
open("test/virus6.tstout","wb").write(fp.getvalue()) open("test/virus6.tstout","wb").write(fp.getvalue())
milter.close() milter.close()
testutils.py
+7 -7
View File
@@ -21,24 +21,24 @@ class AddrCacheTestCase(unittest.TestCase):
cache['foo@bar.com'] = None cache['foo@bar.com'] = None
cache.addperm('baz@bar.com') cache.addperm('baz@bar.com')
cache['temp@bar.com'] = 'testing' cache['temp@bar.com'] = 'testing'
self.failUnless(cache.has_key('foo@bar.com')) self.assertTrue(cache.has_key('foo@bar.com'))
self.failUnless(not cache.has_key('hello@bar.com')) self.assertTrue(not cache.has_key('hello@bar.com'))
self.failUnless('baz@bar.com' in cache) self.assertTrue('baz@bar.com' in cache)
self.assertEquals(cache['temp@bar.com'],'testing') self.assertEquals(cache['temp@bar.com'],'testing')
s = open(self.fname).readlines() s = open(self.fname).readlines()
self.failUnless(len(s) == 2) self.assertTrue(len(s) == 2)
self.failUnless(s[0].startswith('foo@bar.com ')) self.assertTrue(s[0].startswith('foo@bar.com '))
self.assertEquals(s[1].strip(),'baz@bar.com') self.assertEquals(s[1].strip(),'baz@bar.com')
# check that new result overrides old # check that new result overrides old
cache['temp@bar.com'] = None cache['temp@bar.com'] = None
self.failUnless(not cache['temp@bar.com']) self.assertTrue(not cache['temp@bar.com'])
def testDomain(self): def testDomain(self):
with open(self.fname,'w') as fp: with open(self.fname,'w') as fp:
print('spammer.com',file=fp) print('spammer.com',file=fp)
cache = AddrCache(fname=self.fname) cache = AddrCache(fname=self.fname)
cache.load(self.fname,30) cache.load(self.fname,30)
self.failUnless('spammer.com' in cache) self.assertTrue('spammer.com' in cache)
def testParseHeader(self): def testParseHeader(self):
s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?=' s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?='