diff --git a/testsample.py b/testsample.py index 2df8c0eb6c567235884a0d3b35034e0e4e342fa9..b21647da2c110c82036a799a32a4673e7266a7f2 100644 --- a/testsample.py +++ b/testsample.py @@ -17,15 +17,15 @@ class BMSMilterTestCase(unittest.TestCase): milter.setsymval('{auth_type}','batcomputer') milter.setsymval('j','mailhost') rc = milter.connect() - self.failUnless(rc == Milter.CONTINUE) + self.assertTrue(rc == Milter.CONTINUE) rc = milter.feedMsg(fname) - self.failUnless(milter.user == 'batman',"getsymval failed") - self.failUnless(milter.auth_type != 'batcomputer',"setsymlist failed") - self.failUnless(rc == Milter.ACCEPT) - self.failUnless(milter._bodyreplaced,"Message body not replaced") + self.assertTrue(milter.user == 'batman',"getsymval failed") + self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed") + self.assertTrue(rc == Milter.ACCEPT) + self.assertTrue(milter._bodyreplaced,"Message body not replaced") fp = milter._body 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) msg = mime.message_from_file(fp) s = msg.get_payload(1).get_payload() @@ -36,8 +36,8 @@ class BMSMilterTestCase(unittest.TestCase): milter = TestMilter() milter.connect('somehost') rc = milter.feedMsg(fname) - self.failUnless(rc == Milter.ACCEPT) - self.failIf(milter._bodyreplaced,"Milter needlessly replaced body.") + self.assertTrue(rc == Milter.ACCEPT) + self.assertFalse(milter._bodyreplaced,"Milter needlessly replaced body.") fp = milter._body open('test/'+fname+".tstout","wb").write(fp.getvalue()) milter.close() @@ -46,18 +46,18 @@ class BMSMilterTestCase(unittest.TestCase): milter = TestMilter() milter.connect('somehost') rc = milter.feedMsg('samp1') - self.failUnless(rc == Milter.ACCEPT) - self.failIf(milter._bodyreplaced,"Milter needlessly replaced body.") + self.assertTrue(rc == Milter.ACCEPT) + self.assertFalse(milter._bodyreplaced,"Milter needlessly replaced body.") rc = milter.feedMsg("virus3") - self.failUnless(rc == Milter.ACCEPT) - self.failUnless(milter._bodyreplaced,"Message body not replaced") + self.assertTrue(rc == Milter.ACCEPT) + self.assertTrue(milter._bodyreplaced,"Message body not replaced") fp = milter._body 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") - self.failUnless(rc == Milter.ACCEPT) - self.failUnless(milter._bodyreplaced,"Message body not replaced") - self.failUnless(milter._headerschanged,"Message headers not adjusted") + self.assertTrue(rc == Milter.ACCEPT) + self.assertTrue(milter._bodyreplaced,"Message body not replaced") + self.assertTrue(milter._headerschanged,"Message headers not adjusted") fp = milter._body open("test/virus6.tstout","wb").write(fp.getvalue()) milter.close() diff --git a/testutils.py b/testutils.py index 62dab35811e0cecf7656a51a5d3426c117a70118..01887f7db74cf110e2688f17ab78c2bc9af8c1c1 100644 --- a/testutils.py +++ b/testutils.py @@ -21,24 +21,24 @@ class AddrCacheTestCase(unittest.TestCase): cache['foo@bar.com'] = None cache.addperm('baz@bar.com') cache['temp@bar.com'] = 'testing' - self.failUnless(cache.has_key('foo@bar.com')) - self.failUnless(not cache.has_key('hello@bar.com')) - self.failUnless('baz@bar.com' in cache) + self.assertTrue(cache.has_key('foo@bar.com')) + self.assertTrue(not cache.has_key('hello@bar.com')) + self.assertTrue('baz@bar.com' in cache) self.assertEquals(cache['temp@bar.com'],'testing') s = open(self.fname).readlines() - self.failUnless(len(s) == 2) - self.failUnless(s[0].startswith('foo@bar.com ')) + self.assertTrue(len(s) == 2) + self.assertTrue(s[0].startswith('foo@bar.com ')) self.assertEquals(s[1].strip(),'baz@bar.com') # check that new result overrides old cache['temp@bar.com'] = None - self.failUnless(not cache['temp@bar.com']) + self.assertTrue(not cache['temp@bar.com']) def testDomain(self): with open(self.fname,'w') as fp: print('spammer.com',file=fp) cache = AddrCache(fname=self.fname) cache.load(self.fname,30) - self.failUnless('spammer.com' in cache) + self.assertTrue('spammer.com' in cache) def testParseHeader(self): s='=?UTF-8?B?TGFzdCBGZXcgQ29sZHBsYXkgQWxidW0gQXJ0d29ya3MgQXZhaWxhYmxlAA?='