[Python-checkins] distutils2: More test fiddling

[tarek.ziade]

tarek.ziade pushed 844e2164f861 to distutils2:

http://hg.python.org/distutils2/rev/844e2164f861
changeset:   726:844e2164f861
parent:      724:45418c55703c
user:        ?ric Araujo <merwok at netwok.org>
date:        Fri Oct 01 21:54:27 2010 +0200
summary:     More test fiddling
files:       distutils2/_backport/tests/__init__.py, distutils2/_backport/tests/test_pkgutil.py, distutils2/_backport/tests/test_sysconfig.py, distutils2/tests/__init__.py, runtests-cov.py, runtests.py

diff --git a/distutils2/_backport/tests/__init__.py b/distutils2/_backport/tests/__init__.py
--- a/distutils2/_backport/tests/__init__.py
+++ b/distutils2/_backport/tests/__init__.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-from distutils2.tests.support import unittest
+from distutils2.tests import unittest
 
 
 here = os.path.dirname(__file__) or os.curdir
diff --git a/distutils2/_backport/tests/test_pkgutil.py b/distutils2/_backport/tests/test_pkgutil.py
--- a/distutils2/_backport/tests/test_pkgutil.py
+++ b/distutils2/_backport/tests/test_pkgutil.py
@@ -12,8 +12,8 @@
 except ImportError:
     from distutils2._backport.hashlib import md5
 
-from test.test_support import run_unittest, TESTFN
-from distutils2.tests.support import unittest
+from test.test_support import TESTFN
+from distutils2.tests import unittest, run_unittest
 
 from distutils2._backport import pkgutil
 
diff --git a/distutils2/_backport/tests/test_sysconfig.py b/distutils2/_backport/tests/test_sysconfig.py
--- a/distutils2/_backport/tests/test_sysconfig.py
+++ b/distutils2/_backport/tests/test_sysconfig.py
@@ -14,7 +14,8 @@
         get_config_var, get_config_vars, get_path, get_paths, get_platform,
         get_scheme_names, _main, _SCHEMES)
 
-from distutils2.tests.support import unittest, EnvironGuard
+from distutils2.tests import unittest
+from distutils2.tests.support import EnvironGuard
 from test.test_support import TESTFN, unlink
 try:
     from test.test_support import skip_unless_symlink
diff --git a/distutils2/tests/__init__.py b/distutils2/tests/__init__.py
--- a/distutils2/tests/__init__.py
+++ b/distutils2/tests/__init__.py
@@ -24,8 +24,12 @@
     # improved unittest package from 3.2's standard library
     import unittest
 else:
-    # external release of same package for older versions
-    import unittest2 as unittest
+    try:
+        # external release of same package for older versions
+        import unittest2 as unittest
+    except ImportError:
+        sys.exit('Error: You have to install unittest2')
+
 
 from test.test_support import TESTFN    # use TESTFN from stdlib/test_support.
 
diff --git a/runtests-cov.py b/runtests-cov.py
--- a/runtests-cov.py
+++ b/runtests-cov.py
@@ -83,14 +83,14 @@
         # that module is also completely optional
         pass
 
-    try: 
-        cov.report(morfs, 
-                   omit_prefixes=prefixes, 
+    try:
+        cov.report(morfs,
+                   omit_prefixes=prefixes,
                    show_missing=opts.show_missing)
     except TypeError:
         # Coverage 3.4 turned `omit_prefixes` into a list of globbing patterns
-        cov.report(morfs, 
-                   omit=[p+"*" for p in prefixes], 
+        cov.report(morfs,
+                   omit=[p + "*" for p in prefixes],
                    show_missing=opts.show_missing)
 
 def test_main():
@@ -115,18 +115,13 @@
 
 
 def run_tests(verbose):
-    import distutils2.tests
-    from distutils2.tests import run_unittest, reap_children, TestFailed
+    # do NOT import those at the top level, coverage will be inaccurate if
+    # modules are imported before its magic is started
+    from distutils2.tests import run_unittest, test_suite, reap_children, TestFailed
     from distutils2._backport.tests import test_suite as btest_suite
-    # XXX just supporting -q right now to enable detailed/quiet output
-    if len(sys.argv) > 1:
-        verbose = sys.argv[-1] != '-q'
-    else:
-        verbose = 1
     try:
         try:
-            run_unittest([distutils2.tests.test_suite(), btest_suite()],
-                         verbose_=verbose)
+            run_unittest([test_suite(), btest_suite()], verbose_=verbose)
             return 0
         except TestFailed:
             return 1
@@ -135,11 +130,6 @@
 
 
 if __name__ == "__main__":
-    try:
-        from distutils2.tests import unittest
-    except ImportError:
-        sys.stderr.write('Error: You have to install unittest2\n')
-        sys.exit(1)
     if sys.version < '2.5':
         try:
             from distutils2._backport import hashlib
diff --git a/runtests.py b/runtests.py
--- a/runtests.py
+++ b/runtests.py
@@ -8,8 +8,8 @@
 
 
 def test_main():
-    import distutils2.tests
-    from distutils2.tests import run_unittest, reap_children, TestFailed
+    from distutils2.tests import (run_unittest, reap_children,
+                                  test_suite, TestFailed)
     from distutils2._backport.tests import test_suite as btest_suite
     # XXX just supporting -q right now to enable detailed/quiet output
     if len(sys.argv) > 1:
@@ -18,8 +18,7 @@
         verbose = 1
     try:
         try:
-            run_unittest([distutils2.tests.test_suite(), btest_suite()],
-                         verbose_=verbose)
+            run_unittest([test_suite(), btest_suite()], verbose_=verbose)
             return 0
         except TestFailed:
             return 1
@@ -28,11 +27,6 @@
 
 
 if __name__ == "__main__":
-    try:
-        from distutils2.tests.support import unittest
-    except ImportError:
-        sys.stderr.write('Error: You have to install unittest2')
-        sys.exit(1)
     if sys.version < '2.5':
         try:
             from distutils2._backport import hashlib

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