Fix python3 unit tests
This commit is contained in:
+1
-4
@@ -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
@@ -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
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user