[Checkins] SVN: z3c.testsetup/trunk/src/z3c/testsetup/ Fix tests.

[Uli Fouquet]

Log message for revision 99711:
  Fix tests.

Changed:
  U   z3c.testsetup/trunk/src/z3c/testsetup/README.txt
  U   z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt

-=-
Modified: z3c.testsetup/trunk/src/z3c/testsetup/README.txt
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/README.txt	2009-05-04 14:46:18 UTC (rev 99710)
+++ z3c.testsetup/trunk/src/z3c/testsetup/README.txt	2009-05-04 14:46:57 UTC (rev 99711)
@@ -146,15 +146,15 @@
   ...     ]
   >>> from z3c.testsetup import testrunner
   >>> testrunner.run(defaults)
-    Running z3c...functional.layer.DefaultZCMLLayer [ftesting.zcml] tests:
-      Set up z3c....layer.DefaultZCMLLayer [ftesting.zcml] in N.NNN seconds.
+    Running z3c...layer.DefaultZCMLLayer [...ftesting.zcml] tests:
+      Set up z3c...DefaultZCMLLayer [...ftesting.zcml] in N.NNN seconds.
       Ran 3 tests with 0 failures and 0 errors in N.NNN seconds.
-    Running z3c...functional.layer.DefaultZCMLLayer [ftesting2.zcml] tests:
-      Tear down z3c...layer.DefaultZCMLLayer [ftesting.zcml] ... not supported
+    Running z3c...layer.DefaultZCMLLayer [...ftesting2.zcml] tests:
+      Tear down z3c...DefaultZCMLLayer [...ftesting.zcml] ... not supported
       Running in a subprocess.
-      Set up z3c...layer.DefaultZCMLLayer [ftesting2.zcml] in N.NNN seconds.
+      Set up z3c...DefaultZCMLLayer [...ftesting2.zcml] in N.NNN seconds.
       Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
-      Tear down z3c...layer.DefaultZCMLLayer [ftesting2.zcml] ... not supported
+      Tear down z3c...DefaultZCMLLayer [...ftesting2.zcml] ... not supported
     Running z3c.testsetup.tests.othercave.testing.UnitLayer2 tests:
       Running in a subprocess.
       Set up z3c.testsetup.tests.othercave.testing.UnitLayer1 in N.NNN seconds.

Modified: z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt	2009-05-04 14:46:18 UTC (rev 99710)
+++ z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt	2009-05-04 14:46:57 UTC (rev 99711)
@@ -507,20 +507,31 @@
     ...     '--tests-pattern', '^layeredsetup01$',
     ...     ]
     >>> testrunner.run(defaults)
+    Running z3c...DefaultZCMLLayer [/.../bar/ftesting.zcml] tests:
+      Set up z3c...DefaultZCMLLayer [/.../bar/ftesting.zcml] in N.NNN seconds.
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+    Running z3c...DefaultZCMLLayer [/.../foo/ftesting.zcml] tests:
+      Tear down z3c...efaultZCMLLayer [/.../bar/ftesting.zcml] ... not supported
+      Running in a subprocess.
+      Set up z3c...efaultZCMLLayer [/.../foo/ftesting.zcml] in N.NNN seconds.
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+      Tear down z3c...efaultZCMLLayer [/.../foo/ftesting.zcml] ... not supported
     Running z3c.testsetup.tests.layered_cave.layer.FunctionalLayer1 tests:
-      Set up z3c.testsetup...yered_cave.layer.FunctionalLayer1 in ... seconds.
-      Ran 1 tests with 0 failures and 0 errors in ... seconds.
+      Running in a subprocess.
+      Set up z3c...layered_cave.layer.FunctionalLayer1 in N.NNN seconds.
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+      Tear down z3c...layered_cave.layer.FunctionalLayer1 in N.NNN seconds.
     Running z3c.testsetup.tests.layered_cave.layer.UnitLayer1 tests:
-      Tear down z3c.testsetup...red_cave.layer.FunctionalLayer1 in ... seconds.
-      Set up z3c.testsetup...layered_cave.layer.UnitLayer1 in ... seconds.
+      Running in a subprocess.
+      Set up z3c.testsetup.tests.layered_cave.layer.UnitLayer1 in N.NNN seconds.
         Running testSetUp of UnitLayer1
         Running testTearDown of UnitLayer1
-      Ran 1 tests with 0 failures and 0 errors in ... seconds.
-    Tearing down left over layers:
-      Tear down z3c.testsetup...layered_cave.layer.UnitLayer1 in ... seconds.
-    Total: 2 tests, 0 failures, 0 errors in ... seconds.
+      Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
+      Tear down z3c...layered_cave.layer.UnitLayer1 in N.NNN seconds.
+    Total: 4 tests, 0 failures, 0 errors in N.NNN seconds.
     False
 
+
 As we can see, the layer `UnitLayer1` was executed here.
 
 Convenience Stuff