From d30918aca7f185e789c5da6b11d6cae3aed12fe2 Mon Sep 17 00:00:00 2001
From: "Stuart D. Gathman" <stuart@gathman.org>
Date: Sun, 23 Dec 2018 23:38:15 -0500
Subject: [PATCH] Fix python3 unit tests
---
Milter/test.py | 5 +----
Milter/testctx.py | 10 +++++-----
testsample.py | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/Milter/test.py b/Milter/test.py
index 55b27bf..846752e 100644
--- a/Milter/test.py
+++ b/Milter/test.py
@@ -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:
diff --git a/Milter/testctx.py b/Milter/testctx.py
index 64b20c9..b50dbb8 100644
--- a/Milter/testctx.py
+++ b/Milter/testctx.py
@@ -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
diff --git a/testsample.py b/testsample.py
index 82977ae..96f40cb 100644
--- a/testsample.py
+++ b/testsample.py
@@ -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")
--
GitLab