Merge backout for test suite fix

jaraco · jaraco · commit b44c849de4d9 · 2016-09-01T21:59:46.000-04:00
diff --git 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 @@ def test_non_local_discovery(self):
             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())
