Fix python3 unit tests

This commit is contained in:
Stuart D. Gathman
2018-12-23 23:38:15 -05:00
parent 4e8fda517c
commit d30918aca7
3 changed files with 7 additions and 10 deletions
+1 -4
View File
@@ -63,10 +63,7 @@ class TestBase(object):
syms = self._symlist[stage]
if syms is not None and name not in syms:
return None
r = self._macros.get(name,None)
if r is not None:
return r.decode()
return r
return self._macros.get(name,None)
def replacebody(self,chunk):
if self._body:
+5 -5
View File
@@ -63,13 +63,13 @@ class TestCtx(object):
def getsymval(self,name):
stage = self._stage
if stage >= 0:
try:
s = name.encode('utf8')
except: pass
syms = self._symlist[stage]
if syms is not None and name not in syms:
if syms is not None and s not in syms:
return None
r = self._macros.get(name,None)
if r is not None:
return r.decode()
return r
return self._macros.get(name,None)
def _setsymval(self,name,val):
self._macros[name] = val
+1 -1
View File
@@ -46,7 +46,7 @@ class BMSMilterTestCase(unittest.TestCase):
self.assertTrue(rc == Milter.CONTINUE)
rc = milter.feedMsg(fname)
self.assertTrue(milter.user == 'batman',"getsymval failed")
# setsymlist not called yet in sampleMilter
# setsymlist not working in TestBase
#self.assertTrue(milter.auth_type != 'batcomputer',"setsymlist failed")
self.assertTrue(rc == Milter.ACCEPT)
self.assertTrue(milter._bodyreplaced,"Message body not replaced")