[Python-checkins] distutils2: made the test_test pass again + added test boilerplate

[tarek.ziade]

tarek.ziade pushed 4b87947839a9 to distutils2:

http://hg.python.org/distutils2/rev/4b87947839a9
changeset:   617:4b87947839a9
user:        Konrad Delong <konryd at gmail.com>
date:        Thu Aug 12 20:49:01 2010 +0200
summary:     made the test_test pass again + added test boilerplate
files:       src/distutils2/command/test.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
@@ -38,9 +38,10 @@
             args = {"module": self.test_suite,
                     "argv": sys.argv[:1]
             }
-            loader_instance = resolve_name(self.test_loader)
-            if loader_instance is not None:
-                args['testLoader'] = loader_instance
+            if self.test_loader:
+                loader_class = resolve_name(self.test_loader)
+                if loader_class is not None:
+                    args['testLoader'] = loader_class()
             unittest.main(**args)
         finally:
             os.chdir(prev_cwd)
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
@@ -104,3 +104,6 @@
 
 def test_suite():
     return unittest.makeSuite(TestTest)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

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