summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-09-02 02:00:03 (GMT)
committerJason R. Coombs <jaraco@jaraco.com>2016-09-02 02:00:03 (GMT)
commit9650b19212c6dcd30e3e4e077403863cd931c50a (patch)
tree8cc4c243bfcfac191841c464fa7a97a83d2f0a5d /Lib/distutils
parent75fbf87d7367f23ecd400694d3e4ac65fda3cf1a (diff)
parentb44c849de4d99e2ebc4a5d3ff38401a70fbab2e0 (diff)
downloadcpython-9650b19212c6dcd30e3e4e077403863cd931c50a.zip
cpython-9650b19212c6dcd30e3e4e077403863cd931c50a.tar.gz
cpython-9650b19212c6dcd30e3e4e077403863cd931c50a.tar.bz2
Merge backout for test suite fix
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/tests/test_filelist.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
index e719198..391af3c 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())