Changeset 2067

Timestamp:

06/25/09 13:15:57 (9 months ago)

Author:

JensDiemer

Message:

err.message -> str(err)

Files:

• branches/0.9/pylucid_project/tests/test_tools/test_runner.py (modified) (10 diffs)

branches/0.9/pylucid_project/tests/test_tools/test_runner.py

@@ -33 +33 @@
 UNITTEST_PLUGIN_DST_PATH = os.path.join(settings.PYLUCID_PLUGINS_ROOT, "unittest_plugin")
 
-TEST_NAMES = ["pylucid_project.tests",]
+TEST_NAMES = ["pylucid_project.tests", ]
 for app_name in settings.INSTALLED_APPS:
     if app_name.startswith("pylucid"):
         TEST_NAMES.append("%s.tests" % app_name)
-    
-    
+
+
 def _import_test(module_name, class_name=None):
     """
@@ -53 +53 @@
             except TypeError:
                 raise ValueError("Test label '%s.%s' does not refer to a test class" %
-                                 (module_name,'.'.join(class_name)))
+                                 (module_name, '.'.join(class_name)))
         else: # label is fname.TestClass.test_method
             return test_class(class_name[1])
@@ -67 +67 @@
     if verbosity:
         print "\nContruct a test suite from all available tests."
-    if verbosity>=2:
+    if verbosity >= 2:
         print "Use test names: %r\n" % TEST_NAMES
-        
+
     test_suite = unittest.TestSuite()
-    
+
     for name in TEST_NAMES:
         try:
             tests = unittest.defaultTestLoader.loadTestsFromName(name)
         except AttributeError, err:
-            if err.message != "'module' object has no attribute 'tests'":
+            if str(err) != "'module' object has no attribute 'tests'":
                 # Skip only if no tests available
                 raise
-            if verbosity>=2:
+            if verbosity >= 2:
                 print "Skip %r: %s" % (name, err)
         else:
             if verbosity:
                 print "Add %s tests from %r" % (tests.countTestCases(), name)
-            if verbosity>=2:
+            if verbosity >= 2:
                 for testcase in tests:
                     for test in testcase._tests:
@@ -91 +91 @@
                         print "\t%s.%s.%s" % (file_name, test.__class__.__name__, test._testMethodName)
             test_suite.addTest(tests)
-            
+
     if verbosity:
         print
-        
+
     return test_suite
 
@@ -107 +107 @@
     if verbosity:
         print "Building test suite."
-        
+
     if test_labels:
         test_suite = unittest.TestSuite()
@@ -115 +115 @@
                 test_suite.addTest(_import_test(parts[0]))
             else:
-                test_suite.addTest(_import_test(parts[0],parts[1:]))
+                test_suite.addTest(_import_test(parts[0], parts[1:]))
         return test_suite
     else:
@@ -133 +133 @@
     if verbosity:
         print "OK"
-        
+
     # Add unittest template dir
     settings.TEMPLATE_DIRS += (os.path.join(UNITTEST_PLUGIN_DST_PATH, "templates"),)
@@ -166 +166 @@
     if verbosity:
         print "start tests:", test_labels, "\n"
-       
+
     setup_test_environment()
-    
+
     setup_unittest_plugin(verbosity)
-    
+
     old_name = settings.DATABASE_NAME
-    
+
     from django.db import connection
-    
+
     db_name = connection.creation.create_test_db(
         verbosity=verbosity, autoclobber=not interactive
@@ -180 +180 @@
     if verbosity:
         print "\nTest database '%s' created" % db_name
-      
+
     pylucid_test_data.create_pylucid_test_data(site=None, verbosity=verbosity)
-    
+
     suite = get_tests(test_labels, verbosity)
     if verbosity:
@@ -189 +189 @@
     connection.creation.destroy_test_db(old_name, verbosity)
     teardown_test_environment()
-    
+
     teardown_unittest_plugin(verbosity)