[Checkins] SVN: z3c.testsetup/branches/multani-patches/src/z3c/testsetup/ Provide a checker to alias the directory of z3c.testsetup under tests

Jonathan Ballet jon at multani.info
Thu Dec 16 04:09:57 EST 2010


Log message for revision 118943:
  Provide a checker to alias the directory of z3c.testsetup under tests
  

Changed:
  U   z3c.testsetup/branches/multani-patches/src/z3c/testsetup/functional/functionaldoctestsetup.txt
  U   z3c.testsetup/branches/multani-patches/src/z3c/testsetup/testrunner.txt
  U   z3c.testsetup/branches/multani-patches/src/z3c/testsetup/tests/test_testsetup.py

-=-
Modified: z3c.testsetup/branches/multani-patches/src/z3c/testsetup/functional/functionaldoctestsetup.txt
===================================================================
--- z3c.testsetup/branches/multani-patches/src/z3c/testsetup/functional/functionaldoctestsetup.txt	2010-12-16 09:01:18 UTC (rev 118942)
+++ z3c.testsetup/branches/multani-patches/src/z3c/testsetup/functional/functionaldoctestsetup.txt	2010-12-16 09:09:57 UTC (rev 118943)
@@ -402,14 +402,14 @@
        >>> from z3c.testsetup.tests import cave_to_let
        >>> setup = FunctionalDocTestSetup(cave_to_let)
        >>> setup.layer.config_file
-       '.../tests/cave_to_let/ftesting.zcml'
+       '/COMPONENT/tests/cave_to_let/ftesting.zcml'
 
     The fallback-solution is to take the layer from the
     `z3c.testsetup` package::
 
        >>> setup = FunctionalDocTestSetup(cave)
        >>> setup.layer.config_file
-       '...z3c/testsetup/functional/ftesting.zcml'
+       '/COMPONENT/functional/ftesting.zcml'
 
     Now the fallback `ftesting.zcml` was taken, because the cave got
     no own ftesting.zcml.
@@ -455,7 +455,7 @@
    ...     cave,
    ...     zcml_config = 'sampleftesting.zcml')
    >>> setup_w_custom_layer.layer.config_file
-   '.../tests/cave/sampleftesting.zcml'
+   '/COMPONENT/tests/cave/sampleftesting.zcml'
 
 You can also pass a keyword parameter `layer`, which should provide a
 value with a ready-to-use ZCML layer. If this happens, the
@@ -479,7 +479,7 @@
    ...     zcml_config = 'sampleftesting.zcml',
    ...     layer = mylayer)
    >>> setup_w_custom_layer.layer.config_file
-   '.../testsetup/functional/ftesting.zcml'
+   '/COMPONENT/functional/ftesting.zcml'
 
 As we can see, the `mylayer` config file is registered and the
 `zcml_config` parameter was skipped.

Modified: z3c.testsetup/branches/multani-patches/src/z3c/testsetup/testrunner.txt
===================================================================
--- z3c.testsetup/branches/multani-patches/src/z3c/testsetup/testrunner.txt	2010-12-16 09:01:18 UTC (rev 118942)
+++ z3c.testsetup/branches/multani-patches/src/z3c/testsetup/testrunner.txt	2010-12-16 09:09:57 UTC (rev 118943)
@@ -315,19 +315,19 @@
       Set up z3c.testsetup...doctesting.FunctionalLayer in ... seconds.
     <BLANKLINE>
     <BLANKLINE>
-    Failure in test /.../z3c/testsetup/tests/cave/checkertest.chk
+    Failure in test /COMPONENT/tests/cave/checkertest.chk
     ...Failed doctest test for checkertest.chk
-      File "/.../z3c/testsetup/tests/cave/checkertest.chk", line 0
+      File "/COMPONENT/tests/cave/checkertest.chk", line 0
     <BLANKLINE>
     ----------------------------------------------------------------------
-    File "/.../tests/cave/checkertest.chk", line 10, in checkertest.chk
+    File "/COMPONENT/tests/cave/checkertest.chk", line 10, in checkertest.chk
     Failed example:
         print "%s seconds" % 0.123
     Differences (ndiff with -expected +actual):
         - <SOME NUMBER OF> seconds
         + 0.123 seconds
     ----------------------------------------------------------------------
-    File "/.../tests/cave/checkertest.chk", line 15, in checkertest.chk
+    File "/COMPONENT/tests/cave/checkertest.chk", line 15, in checkertest.chk
     Failed example:
         print "A memory address at 0x1a0322ff"
     Differences (ndiff with -expected +actual):
@@ -341,19 +341,19 @@
       Set up zope...testrunner.layer.UnitTests in ... seconds.
     <BLANKLINE>
     <BLANKLINE>
-    Failure in test /.../z3c/testsetup/tests/cave/checkertest.chk
+    Failure in test /COMPONENT/tests/cave/checkertest.chk
     ...Failed doctest test for checkertest.chk
-      File "/.../z3c/testsetup/tests/cave/checkertest.chk", line 0
+      File "/COMPONENT/tests/cave/checkertest.chk", line 0
     <BLANKLINE>
     ----------------------------------------------------------------------
-    File "/.../tests/cave/checkertest.chk", line 10, in checkertest.chk
+    File "/COMPONENT/tests/cave/checkertest.chk", line 10, in checkertest.chk
     Failed example:
         print "%s seconds" % 0.123
     Differences (ndiff with -expected +actual):
         - <SOME NUMBER OF> seconds
         + 0.123 seconds
     ----------------------------------------------------------------------
-    File "/.../tests/cave/checkertest.chk", line 15, in checkertest.chk
+    File "/COMPONENT/tests/cave/checkertest.chk", line 15, in checkertest.chk
     Failed example:
         print "A memory address at 0x1a0322ff"
     Differences (ndiff with -expected +actual):

Modified: z3c.testsetup/branches/multani-patches/src/z3c/testsetup/tests/test_testsetup.py
===================================================================
--- z3c.testsetup/branches/multani-patches/src/z3c/testsetup/tests/test_testsetup.py	2010-12-16 09:01:18 UTC (rev 118942)
+++ z3c.testsetup/branches/multani-patches/src/z3c/testsetup/tests/test_testsetup.py	2010-12-16 09:09:57 UTC (rev 118943)
@@ -33,6 +33,10 @@
     #windows path separator:
     (re.compile(r'\\\\'), '/'),
     (re.compile(r'\\'), '/'),
+    # The component directory, to make test more readable
+    (re.compile(
+        os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))),
+        '/COMPONENT'),
     ])
 
 



More information about the checkins mailing list