[Checkins] SVN: z3c.etree/trunk/src/z3c/etree/ - Brute-force tests into passing with latest zope.testrunner

[Sidnei da Silva]

Log message for revision 97840:
  - Brute-force tests into passing with latest zope.testrunner

Changed:
  U   z3c.etree/trunk/src/z3c/etree/doctesttests.txt
  U   z3c.etree/trunk/src/z3c/etree/tests.py

-=-
Modified: z3c.etree/trunk/src/z3c/etree/doctesttests.txt
===================================================================
--- z3c.etree/trunk/src/z3c/etree/doctesttests.txt	2009-03-11 14:31:27 UTC (rev 97839)
+++ z3c.etree/trunk/src/z3c/etree/doctesttests.txt	2009-03-11 15:13:37 UTC (rev 97840)
@@ -13,8 +13,8 @@
 
   >>> sys.argv = 'test --tests-pattern ^doctests$ '.split()
   >>> testrunner.run(defaults)
-  ... # doctest: +NORMALIZE_WHITESPACE
-  Running unit tests:
+  ... # doctest: +NORMALIZE_WHITESPACE,+REPORT_NDIFF,+ELLIPSIS
+  Running...
   <BLANKLINE>
   <BLANKLINE>
   Failure doctests.txt
@@ -105,5 +105,5 @@
   XML differences:
      'test2' != 'test1' different tag name.
   <BLANKLINE>
-    Ran N tests with N failures and N errors in N.NNN seconds.
+    Ran N tests with N failures and N errors in N.NNN seconds...
   True

Modified: z3c.etree/trunk/src/z3c/etree/tests.py
===================================================================
--- z3c.etree/trunk/src/z3c/etree/tests.py	2009-03-11 14:31:27 UTC (rev 97839)
+++ z3c.etree/trunk/src/z3c/etree/tests.py	2009-03-11 15:13:37 UTC (rev 97840)
@@ -220,8 +220,11 @@
             )
         test.globs['this_directory'] = os.path.split(__file__)[0]
         test.globs['testrunner_script'] = __file__
-        test.globs['old_configure_logging'] = testrunner.configure_logging
-        testrunner.configure_logging = lambda : None
+        try:
+            test.globs['old_configure_logging'] = testrunner.configure_logging
+            testrunner.configure_logging = lambda : None
+        except AttributeError:
+            pass
         test.globs['old_engine'] = os.environ.get(
             z3c.etree.testing.engine_env_key)
         os.environ[z3c.etree.testing.engine_env_key] = self.engine_key
@@ -232,8 +235,11 @@
     gc.set_threshold(*test.globs['saved-sys-info'][3])
     sys.modules.clear()
     sys.modules.update(test.globs['saved-sys-info'][2])
-    testrunner.configure_logging = test.globs['old_configure_logging']
-    del test.globs['old_configure_logging']
+    try:
+        testrunner.configure_logging = test.globs['old_configure_logging']
+        del test.globs['old_configure_logging']
+    except KeyError:
+        pass
     del os.environ[z3c.etree.testing.engine_env_key]
     del test.globs['old_engine']