[Python-checkins] distutils2: switched back to "the right way" of setting test_suite

Sun Sep 19 10:20:21 CEST 2010

tarek.ziade pushed 80798d49fff0 to distutils2:
http://hg.python.org/distutils2/rev/80798d49fff0
changeset: 599:80798d49fff0
user: Konrad Delong <konryd at gmail.com>
date: Tue Jul 27 14:41:20 2010 +0200
summary: switched back to "the right way" of setting test_suite
files: src/distutils2/command/test.py, src/distutils2/dist.py, src/distutils2/tests/test_test.py

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
@@ -14,7 +14,7 @@
 self.test_suite = None
 
 def finalize_options(self):
- self.test_suite = self.distribution.test_suite
+ pass
 
 def distpath(self):
 self.run_command('build')
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -204,7 +204,6 @@
 self.scripts = None
 self.data_files = None
 self.password = ''
- self.test_suite = None
 
 # And now initialize bookkeeping stuff that can't be supplied by
 # the caller at all. 'command_obj' maps command names to
diff --git a/src/distutils2/tests/test_test.py b/src/distutils2/tests/test_test.py
--- a/src/distutils2/tests/test_test.py
+++ b/src/distutils2/tests/test_test.py
@@ -19,10 +19,14 @@
 setup(name='somedist',
 version='0.1',
 py_modules=['myowntestmodule', 'somemod'],
- test_suite='myowntestmodule',
 )
 '''
 
+SETUP_CFG = '''\
+[test]
+test-suite = myowntestmodule
+'''
+
 EXPECTED_OUTPUT = '''\
 FAIL: test_blah (myowntestmodule.SomeTest)
 ----------------------------------------------------------------------
@@ -54,6 +58,7 @@
 # prepare distribution
 pkg_dir = self.mkdtemp()
 self.write_file(join(pkg_dir, "setup.py"), SETUP_PY)
+ self.write_file(join(pkg_dir, "setup.cfg"), SETUP_CFG)
 self.write_file(join(pkg_dir, "somemod.py"), "")
 self.write_file(join(pkg_dir, "myowntestmodule.py"), TEST_BODY)
 return pkg_dir
--
Repository URL: http://hg.python.org/distutils2
