[Python-checkins] cpython (merge 3.5 -> default): Merge backout for test suite fix

[jason.coombs]

https://hg.python.org/cpython/rev/abc4de9b09b8
changeset:   103001:abc4de9b09b8
parent:      102998:79422fab2ef4
parent:      103000:0561fcc33211
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Thu Sep 01 22:00:03 2016 -0400
summary:
  Merge backout for test suite fix

files:
  Lib/distutils/tests/test_filelist.py |  11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
--- a/Lib/distutils/tests/test_filelist.py
+++ b/Lib/distutils/tests/test_filelist.py
@@ -9,7 +9,7 @@
 from distutils import filelist
 
 import test.support
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
 MANIFEST_IN = """\
@@ -329,5 +329,12 @@
             self.assertEqual(filelist.findall(temp_dir), expected)
 
 
+def test_suite():
+    return unittest.TestSuite([
+        unittest.makeSuite(FileListTestCase),
+        unittest.makeSuite(FindAllTestCase),
+    ])
+
+
 if __name__ == "__main__":
-    unittest.main()
+    run_unittest(test_suite())

-- 
Repository URL: https://hg.python.org/cpython