From: Jason R. Coombs <jaraco@jaraco.com>
Date: Fri, 2 Sep 2016 01:55:22 +0000 (-0400)
Subject: Backed out changeset cc86e9e102e8
X-Git-Tag: v3.4.6rc1~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ac147d6ee42d156ecc9b3ed2f57cc9c9f86f746;p=thirdparty%2FPython%2Fcpython.git

Backed out changeset cc86e9e102e8
---

diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
index e719198c6d9c..391af3cba23f 100644
--- a/Lib/distutils/tests/test_filelist.py
+++ b/Lib/distutils/tests/test_filelist.py
@@ -9,7 +9,7 @@ from distutils.filelist import glob_to_re, translate_pattern, FileList
 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 @@ class FindAllTestCase(unittest.TestCase):
             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())