[Checkins] SVN: z3c.testsetup/trunk/src/z3c/testsetup/testgetter.py Ignore calling script when registering tests.

Uli Fouquet uli at gnufix.de
Wed Jul 23 19:35:31 EDT 2008


Log message for revision 88774:
  Ignore calling script when registering tests.

Changed:
  U   z3c.testsetup/trunk/src/z3c/testsetup/testgetter.py

-=-
Modified: z3c.testsetup/trunk/src/z3c/testsetup/testgetter.py
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/testgetter.py	2008-07-23 23:11:46 UTC (rev 88773)
+++ z3c.testsetup/trunk/src/z3c/testsetup/testgetter.py	2008-07-23 23:35:31 UTC (rev 88774)
@@ -41,7 +41,12 @@
             self.defaults = kw['defaults']
             del kw['defaults']
         self.settings = kw
-        self.package = get_package(pkg_or_dotted_name)
+        try:
+            self.package = get_package(pkg_or_dotted_name)
+        except ImportError:
+            # This might happen when we try to resolve the calling script.
+            self.package = None
+            pass
         self.initialize()
         return
 
@@ -57,6 +62,8 @@
         """
         self.filterKeywords()
         suite = unittest.TestSuite()
+        if self.package is None:
+            return suite
         suite.addTest(
             self.wrapped_class(
                 self.package, **self.settings).getTestSuite()
@@ -119,6 +126,8 @@
         """
         suite = unittest.TestSuite()
         for getter_cls in self.handled_getters:
+            if self.package is None:
+                continue
             getter = getter_cls(self.package, **self.settings)
             # Merge our defaults with target defaults...
             target_defaults = getattr(getter, 'defaults', {})



More information about the Checkins mailing list