[Python-checkins] distutils2: changed semantics of test_suite to actually mean test_suite

[tarek.ziade]

tarek.ziade pushed d7ebb655e75e to distutils2:

http://hg.python.org/distutils2/rev/d7ebb655e75e
changeset:   618:d7ebb655e75e
user:        Konrad Delong <konryd at gmail.com>
date:        Fri Aug 13 12:24:31 2010 +0200
summary:     changed semantics of test_suite to actually mean test_suite
files:       src/distutils2/command/test.py, src/distutils2/tests/dists/extensions_test/myowntestmodule.py, src/distutils2/tests/dists/extensions_test/setup.cfg, src/distutils2/tests/dists/simple_test/myowntestmodule.py, src/distutils2/tests/dists/simple_test/setup.cfg

diff --git a/src/distutils2/command/test.py b/src/distutils2/command/test.py
--- a/src/distutils2/command/test.py
+++ b/src/distutils2/command/test.py
@@ -24,7 +24,7 @@
         if self.distribution.tests_require:
             for requirement in self.distribution.tests_require:
                 if get_distribution(requirement) is None:
-                    warnings.warn("The test dependency %s is not installed which may couse the tests to fail.",
+                    warnings.warn("The test dependency %s is not installed which may couse the tests to fail." % requirement,
                                   RuntimeWarning)
 
     def run(self):
@@ -35,13 +35,14 @@
                 build.inplace = 1 # TODO - remove make sure it's needed
                 self.run_command('build')
                 os.chdir(self.build_lib)
-            args = {"module": self.test_suite,
-                    "argv": sys.argv[:1]
-            }
+            args = {}
             if self.test_loader:
                 loader_class = resolve_name(self.test_loader)
-                if loader_class is not None:
-                    args['testLoader'] = loader_class()
-            unittest.main(**args)
+                args['testLoader'] = loader_class()
+            if self.test_suite:
+                argv = [unittest.__file__, '--verbose', self.test_suite]
+            else:
+                argv = [unittest.__file__, '--verbose']
+            unittest.main(None, None, argv, **args)
         finally:
             os.chdir(prev_cwd)
diff --git a/src/distutils2/tests/dists/extensions_test/myowntestmodule.py b/src/distutils2/tests/dists/extensions_test/myowntestmodule.py
--- a/src/distutils2/tests/dists/extensions_test/myowntestmodule.py
+++ b/src/distutils2/tests/dists/extensions_test/myowntestmodule.py
@@ -2,3 +2,5 @@
 class SomeTest(unittest.TestCase):
     def test_blah(self):
         self.fail("horribly")
+def test_suite():
+    return unittest.makeSuite(SomeTest)
diff --git a/src/distutils2/tests/dists/extensions_test/setup.cfg b/src/distutils2/tests/dists/extensions_test/setup.cfg
--- a/src/distutils2/tests/dists/extensions_test/setup.cfg
+++ b/src/distutils2/tests/dists/extensions_test/setup.cfg
@@ -1,2 +1,2 @@
 [test]
-test-suite = myowntestmodule
+test-suite = myowntestmodule.test_suite
diff --git a/src/distutils2/tests/dists/simple_test/myowntestmodule.py b/src/distutils2/tests/dists/simple_test/myowntestmodule.py
--- a/src/distutils2/tests/dists/simple_test/myowntestmodule.py
+++ b/src/distutils2/tests/dists/simple_test/myowntestmodule.py
@@ -2,3 +2,5 @@
 class SomeTest(unittest.TestCase):
     def test_blah(self):
         self.fail("horribly")
+def test_suite():
+    return unittest.makeSuite(SomeTest)
diff --git a/src/distutils2/tests/dists/simple_test/setup.cfg b/src/distutils2/tests/dists/simple_test/setup.cfg
--- a/src/distutils2/tests/dists/simple_test/setup.cfg
+++ b/src/distutils2/tests/dists/simple_test/setup.cfg
@@ -1,2 +1,2 @@
 [test]
-test-suite = myowntestmodule
+test-suite = myowntestmodule.test_suite

--
Repository URL: http://hg.python.org/distutils2