[Python-checkins] cpython (3.4): Issue 24215: Added tests for more builtin types in test_pprint.

Wed May 20 18:38:28 CEST 2015

https://hg.python.org/cpython/rev/2c074a8dd084
changeset: 96176:2c074a8dd084
branch: 3.4
parent: 96173:3a1ee0b5a096
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed May 20 19:37:10 2015 +0300
summary:
 Issue 24215: Added tests for more builtin types in test_pprint.
Made test_pprint and test_trace discoverable.
files:
 Lib/test/test_pprint.py | 17 ++++++++---------
 Lib/test/test_trace.py | 12 ++++--------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py
--- a/Lib/test/test_pprint.py
+++ b/Lib/test/test_pprint.py
@@ -58,7 +58,8 @@
 def test_basic(self):
 # Verify .isrecursive() and .isreadable() w/o recursion
 pp = pprint.PrettyPrinter()
- for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, "yaddayadda",
+ for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, b"def",
+ bytearray(b"ghi"), True, False, None, ...,
 self.a, self.b):
 # module-level convenience functions
 self.assertFalse(pprint.isrecursive(safe),
@@ -128,21 +129,23 @@
 # it sorted a dict display if and only if the display required
 # multiple lines. For that reason, dicts with more than one element
 # aren't tested here.
- for simple in (0, 0, 0+0j, 0.0, "", b"",
+ for simple in (0, 0, 0+0j, 0.0, "", b"", bytearray(),
 (), tuple2(), tuple3(),
 [], list2(), list3(),
 set(), set2(), set3(),
 frozenset(), frozenset2(), frozenset3(),
 {}, dict2(), dict3(),
 self.assertTrue, pprint,
- -6, -6, -6-6j, -1.5, "x", b"x", (3,), [3], {3: 6},
+ -6, -6, -6-6j, -1.5, "x", b"x", bytearray(b"x"),
+ (3,), [3], {3: 6},
 (1,2), [3,4], {5: 6},
 tuple2((1,2)), tuple3((1,2)), tuple3(range(100)),
 [3,4], list2([3,4]), list3([3,4]), list3(range(100)),
 set({7}), set2({7}), set3({7}),
 frozenset({8}), frozenset2({8}), frozenset3({8}),
 dict2({5: 6}), dict3({5: 6}),
- range(10, -11, -1)
+ range(10, -11, -1),
+ True, False, None, ...,
 ):
 native = repr(simple)
 self.assertEqual(pprint.pformat(simple), native)
@@ -597,9 +600,5 @@
 self, object, context, maxlevels, level)
 
 
-def test_main():
- test.support.run_unittest(QueryTestCase)
-
-
 if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -1,8 +1,7 @@
 import os
 import io
 import sys
-from test.support import (run_unittest, TESTFN, rmtree, unlink,
- captured_stdout)
+from test.support import TESTFN, rmtree, unlink, captured_stdout
 import unittest
 
 import trace
@@ -297,7 +296,8 @@
 unlink(TESTFN)
 
 def _coverage(self, tracer,
- cmd='from test import test_pprint; test_pprint.test_main()'):
+ cmd='import test.support, test.test_pprint;'
+ 'test.support.run_unittest(test.test_pprint.QueryTestCase)'):
 tracer.run(cmd)
 r = tracer.results()
 r.write_results(show_missing=True, summary=True, coverdir=TESTFN)
@@ -407,9 +407,5 @@
 trace.find_executable_linenos(fd.name)
 
 
-def test_main():
- run_unittest(__name__)
-
-
 if __name__ == '__main__':
- test_main()
+ unittest.main()
-- 
Repository URL: https://hg.python.org/cpython
