Convert test_strftime, test_getargs, and test_pep247 to use unittest.

Lib/test/test_getargs.py

-"""Test the internal getargs.c implementation
+"""
+Test the internal getargs.c implementation
 
  PyArg_ParseTuple() is defined here.
 
@@ -11,14 +12,23 @@ single case that failed between 2.1 and 2.2a2.
 # verify that the error is propagated properly from the C code back to
 # Python.
 
-# XXX If the encoding succeeds using the current default encoding,
-# this test will fail because it does not test the right part of the
-# PyArg_ParseTuple() implementation.
-from test.test_support import have_unicode
 import marshal
+import unittest
+from test import test_support
+
+class GetArgsTest(unittest.TestCase):
+    # If the encoding succeeds using the current default encoding,
+    # this test will fail because it does not test the right part of the
+    # PyArg_ParseTuple() implementation.
+    def test_with_marshal(self):
+        if not test_support.have_unicode:
+            return
+
+        arg = unicode(r'\222', 'unicode-escape')
+        self.assertRaises(UnicodeError, marshal.loads, arg)
+
+def test_main():
+    test_support.run_unittest(GetArgsTest)
 
-if have_unicode:
-    try:
-        marshal.loads(unicode(r"\222", 'unicode-escape'))
-    except UnicodeError:
-        pass
+if __name__ == '__main__':
+    test_main()

Lib/test/test_pep247.py

-#
-# Test suite to check compliance with PEP 247, the standard API for
-# hashing algorithms.
-#
+"""
+Test suite to check compilance with PEP 247, the standard API
+for hashing algorithms
+"""
 
 import warnings
-warnings.filterwarnings("ignore", "the md5 module is deprecated.*",
+warnings.filterwarnings('ignore', 'the md5 module is deprecated.*',
                         DeprecationWarning)
-warnings.filterwarnings("ignore", "the sha module is deprecated.*",
+warnings.filterwarnings('ignore', 'the sha module is deprecated.*',
                         DeprecationWarning)
 
-import md5, sha, hmac
-from test.test_support import verbose
+import hmac
+import md5
+import sha
 
+import unittest
+from test import test_support
 
-def check_hash_module(module, key=None):
-    assert hasattr(module, 'digest_size'), "Must have digest_size"
-    assert (module.digest_size is None or
-            module.digest_size > 0), "digest_size must be None or positive"
+class Pep247Test(unittest.TestCase):
 
-    if key is not None:
-        obj1 = module.new(key)
-        obj2 = module.new(key, "string")
+    def check_module(self, module, key=None):
+        self.assert_(hasattr(module, 'digest_size'))
+        self.assert_(module.digest_size is None or module.digest_size > 0)
 
-        h1 = module.new(key, "string").digest()
-        obj3 = module.new(key) ; obj3.update("string") ; h2 = obj3.digest()
-        assert h1 == h2, "Hashes must match"
+        if not key is None:
+            obj1 = module.new(key)
+            obj2 = module.new(key, 'string')
 
-    else:
-        obj1 = module.new()
-        obj2 = module.new("string")
+            h1 = module.new(key, 'string').digest()
+            obj3 = module.new(key)
+            obj3.update('string')
+            h2 = obj3.digest()
+        else:
+            obj1 = module.new()
+            obj2 = module.new('string')
 
-        h1 = module.new("string").digest()
-        obj3 = module.new() ; obj3.update("string") ; h2 = obj3.digest()
-        assert h1 == h2, "Hashes must match"
+            h1 = module.new('string').digest()
+            obj3 = module.new()
+            obj3.update('string')
+            h2 = obj3.digest()
 
-    assert hasattr(obj1, 'digest_size'), "Objects must have digest_size attr"
-    if module.digest_size is not None:
-        assert obj1.digest_size == module.digest_size, "digest_size must match"
-    assert obj1.digest_size == len(h1), "digest_size must match actual size"
-    obj1.update("string")
-    obj_copy = obj1.copy()
-    assert obj1.digest() == obj_copy.digest(), "Copied objects must match"
-    assert obj1.hexdigest() == obj_copy.hexdigest(), \
-           "Copied objects must match"
-    digest, hexdigest = obj1.digest(), obj1.hexdigest()
-    hd2 = ""
-    for byte in digest:
-        hd2 += "%02x" % ord(byte)
-    assert hd2 == hexdigest, "hexdigest doesn't appear correct"
+        self.assertEquals(h1, h2)
 
-    if verbose:
-        print 'Module', module.__name__, 'seems to comply with PEP 247'
+        self.assert_(hasattr(obj1, 'digest_size'))
 
+        if not module.digest_size is None:
+            self.assertEquals(obj1.digest_size, module.digest_size)
 
-def test_main():
-    check_hash_module(md5)
-    check_hash_module(sha)
-    check_hash_module(hmac, key='abc')
+        self.assertEquals(obj1.digest_size, len(h1))
+        obj1.update('string')
+        obj_copy = obj1.copy()
+        self.assertEquals(obj1.digest(), obj_copy.digest())
+        self.assertEquals(obj1.hexdigest(), obj_copy.hexdigest())
+
+        digest, hexdigest = obj1.digest(), obj1.hexdigest()
+        hd2 = ""
+        for byte in digest:
+            hd2 += '%02x' % ord(byte)
+        self.assertEquals(hd2, hexdigest)
+
+    def test_md5(self):
+        self.check_module(md5)
 
+    def test_sha(self):
+        self.check_module(sha)
+
+    def test_hmac(self):
+        self.check_module(hmac, key='abc')
+
+def test_main():
+    test_support.run_unittest(Pep247Test)
 
 if __name__ == '__main__':
     test_main()

Misc/NEWS

@@ -75,6 +75,8 @@ Library
 Tests
 -----
 
+- GHOP 293: Convert test_strftime, test_getargs, and test_pep247 to unittest.
+
 - Issue #2055: Convert test_fcntl to unittest.
 
 - Issue 1960: Convert test_gdbm to unittest.