Convert test_strftime, test_getargs, and test_pep247 to use unittest.

1 files changed, 20 insertions, 10 deletions

diff --git a/Lib/test/test_getargs.py b/Lib/test/test_getargs.py
index 4ce34bc..e2c36dd 100644
--- a/Lib/test/test_getargs.py
+++ b/Lib/test/test_getargs.py
@@ -1,4 +1,5 @@
-"""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()