Merge pull request #30 from thegushi/fix/test-suite-python3

tests: fix Python 2 -> 3 portability issues in test suite

Author: jaredmauch

tests/TestBase.py

@@ -32,20 +32,15 @@
 
 
 class TestBase(unittest.TestCase):
-    if hasattr(difflib, 'ndiff'):
-        # Python 2.2 and beyond
-        def ndiffAssertEqual(self, first, second):
-            """Like failUnlessEqual except use ndiff for readable output."""
-            if first != second:
-                sfirst = str(first)
-                ssecond = str(second)
-                diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
-                fp = StringIO()
-                print(NL, NL.join(diff), file=fp)
-                raise (self.failureException, fp.getvalue())
-    else:
-        # Python 2.1
-        ndiffAssertEqual = unittest.TestCase.assertEqual
+    def ndiffAssertEqual(self, first, second):
+        """Like failUnlessEqual except use ndiff for readable output."""
+        if first != second:
+            sfirst = str(first)
+            ssecond = str(second)
+            diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
+            fp = StringIO()
+            print(NL, NL.join(diff), file=fp)
+            raise self.failureException(fp.getvalue())
 
     def setUp(self):
         mlist = MailList.MailList()

tests/test_bounces.py

@@ -21,6 +21,8 @@
 import os
 import unittest
 import email
+
+_TESTDIR = os.path.dirname(os.path.abspath(__file__))
 try:
     from Mailman import __init__
 except ImportError:
@@ -192,9 +194,9 @@ def test_bounce(self):
         for modname, file, addrs in self.DATA:
             module = 'Mailman.Bouncers.' + modname
             __import__(module)
-            fp = open(os.path.join('tests', 'bounces', file))
+            fp = open(os.path.join(_TESTDIR, 'bounces', file), 'rb')
             try:
-                msg = email.message_from_file(fp)
+                msg = email.message_from_binary_file(fp)
             finally:
                 fp.close()
             foundaddrs = sys.modules[module].process(msg)
@@ -212,9 +214,9 @@ def test_bounce(self):
     def test_SMTP32_failure(self):
         from Mailman.Bouncers import SMTP32
         # This file has no X-Mailer: header
-        fp = open(os.path.join('tests', 'bounces', 'postfix_01.txt'))
+        fp = open(os.path.join(_TESTDIR, 'bounces', 'postfix_01.txt'), 'rb')
         try:
-            msg = email.message_from_file(fp)
+            msg = email.message_from_binary_file(fp)
         finally:
             fp.close()
         self.failIf(msg['x-mailer'] is not None)

tests/test_handlers.py

@@ -66,7 +66,7 @@
 
 
 def password(plaintext):
-    return sha_new(plaintext).hexdigest()
+    return sha_new(plaintext.encode()).hexdigest()
 
 
 

tests/test_safedict.py

@@ -84,8 +84,7 @@ def test_allmsg_no_key(self):
     def test_copy(self):
         sd = SafeDict.MsgSafeDict(self._msg, {'foo': 'bar'})
         copy = sd.copy()
-        items = copy.items()
-        items.sort()
+        items = sorted(copy.items())
         self.assertEqual(items, [
             ('allmsg_cc', 'aperson@dom.ain, bperson@dom.ain'),
             ('foo', 'bar'),

tests/test_security_mgr.py

@@ -44,7 +44,7 @@
 
 
 def password(plaintext):
-    return sha_new(plaintext).hexdigest()
+    return sha_new(plaintext.encode()).hexdigest()
 
 
 
@@ -137,7 +137,7 @@ def test_list_admin_unauth(self):
     def test_list_admin_upgrade(self):
         eq = self.assertEqual
         mlist = self._mlist
-        mlist.password = md5_new('ssSSss').digest()
+        mlist.password = md5_new(b'ssSSss').digest()
         eq(mlist.Authenticate(
             [mm_cfg.AuthListAdmin], 'ssSSss'), mm_cfg.AuthListAdmin)
         # Password should be upgraded to PBKDF2 on successful authentication
@@ -155,10 +155,10 @@ def test_list_admin_upgrade(self):
     def test_list_admin_oldstyle_unauth(self):
         eq = self.assertEqual
         mlist = self._mlist
-        mlist.password = md5_new('ssSSss').digest()
+        mlist.password = md5_new(b'ssSSss').digest()
         eq(mlist.Authenticate(
             [mm_cfg.AuthListAdmin], 'xxxxxx'), mm_cfg.UnAuthorized)
-        eq(mlist.password, md5_new('ssSSss').digest())
+        eq(mlist.password, md5_new(b'ssSSss').digest())
         # Test crypt upgrades if crypt is supported
         if crypt:
             mlist.password = crypted = crypt.crypt('rrRRrr', 'zc')