[Python-checkins] distutils2: Allow running all tests via python somefile.py

tarek.ziade python-checkins at python.org
Sun Aug 8 11:50:45 CEST 2010


tarek.ziade pushed c97c7194fc01 to distutils2:

http://hg.python.org/distutils2/rev/c97c7194fc01
changeset:   412:c97c7194fc01
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Jul 31 15:06:02 2010 +0200
summary:     Allow running all tests via python somefile.py
files:       src/distutils2/_backport/tests/__init__.py, src/distutils2/tests/__init__.py, src/distutils2/tests/test_cmd.py

diff --git a/src/distutils2/_backport/tests/__init__.py b/src/distutils2/_backport/tests/__init__.py
--- a/src/distutils2/_backport/tests/__init__.py
+++ b/src/distutils2/_backport/tests/__init__.py
@@ -4,7 +4,7 @@
 from distutils2.tests.support import unittest
 
 
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or '.'
 
 def test_suite():
     suite = unittest.TestSuite()
@@ -16,4 +16,5 @@
             suite.addTest(module.test_suite())
     return suite
 
-
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/src/distutils2/tests/__init__.py b/src/distutils2/tests/__init__.py
--- a/src/distutils2/tests/__init__.py
+++ b/src/distutils2/tests/__init__.py
@@ -23,7 +23,7 @@
 
 from test.test_support import TESTFN    # use TESTFN from stdlib/test_support.
 
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or '.'
 
 verbose = 1
 
diff --git a/src/distutils2/tests/test_cmd.py b/src/distutils2/tests/test_cmd.py
--- a/src/distutils2/tests/test_cmd.py
+++ b/src/distutils2/tests/test_cmd.py
@@ -98,7 +98,7 @@
 
     def test_ensure_dirname(self):
         cmd = self.cmd
-        cmd.option1 = os.path.dirname(__file__)
+        cmd.option1 = os.path.dirname(__file__) or '.'
         cmd.ensure_dirname('option1')
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')

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


More information about the Python-checkins mailing list