diff options
| author | Konrad Delong <konryd@gmail.com> | 2010-08-13 12:24:31 +0200 |
|---|---|---|
| committer | Konrad Delong <konryd@gmail.com> | 2010-08-13 12:24:31 +0200 |
| commit | 01650b657dd275acfa2d72d1f48d66df8f6858ec (patch) | |
| tree | 41b84d7c72254377584008c591ebea8a2c8d11a3 /src | |
| parent | 4f38dcb142b5856ad97ac882c5f6b48cdc8206a5 (diff) | |
| download | disutils2-01650b657dd275acfa2d72d1f48d66df8f6858ec.tar.gz | |
changed semantics of test_suite to actually mean test_suite
Diffstat (limited to 'src')
5 files changed, 14 insertions, 9 deletions
diff --git a/src/distutils2/command/test.py b/src/distutils2/command/test.py index 10c82b6..e6110cb 100644 --- a/src/distutils2/command/test.py +++ b/src/distutils2/command/test.py @@ -24,7 +24,7 @@ class test(Command): 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 @@ class test(Command): 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 index ba74d5a..e4d41ae 100644 --- a/src/distutils2/tests/dists/extensions_test/myowntestmodule.py +++ b/src/distutils2/tests/dists/extensions_test/myowntestmodule.py @@ -2,3 +2,5 @@ import unittest 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 index 5f14fd4..b9a8b6e 100644 --- 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 index ba74d5a..e4d41ae 100644 --- a/src/distutils2/tests/dists/simple_test/myowntestmodule.py +++ b/src/distutils2/tests/dists/simple_test/myowntestmodule.py @@ -2,3 +2,5 @@ import unittest 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 index 5f14fd4..b9a8b6e 100644 --- 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 |