[Checkins] SVN: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/ Fix paths in moved tests.

[Uli Fouquet]

Log message for revision 83425:
  Fix paths in moved tests.

Changed:
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/functionaldoctestsetup.txt
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testrunner.txt
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/unitdoctestsetup.txt

-=-
Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/functionaldoctestsetup.txt
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/functionaldoctestsetup.txt	2008-02-02 15:20:33 UTC (rev 83424)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/functionaldoctestsetup.txt	2008-02-02 15:30:13 UTC (rev 83425)
@@ -198,7 +198,7 @@
 available as an object attribute::
 
     >>> setup.regexp_list
-    ['^\\\\s*:(T|t)est-(L|l)ayer:\\\\s*(functional)\\\\s*']
+    ['^\\s*:(T|t)est-(L|l)ayer:\\s*(functional)\\s*']
 
 This is the default value of functional test setups.
 

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testrunner.txt
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testrunner.txt	2008-02-02 15:20:33 UTC (rev 83424)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testrunner.txt	2008-02-02 15:30:13 UTC (rev 83425)
@@ -10,7 +10,7 @@
 ------------
 
     >>> import os
-    >>> cavepath = os.path.join(os.path.dirname(__file__), 'cave')
+    >>> cavepath = os.path.join(os.path.dirname(__file__), 'tests', 'cave')
     >>> setupfile = os.path.join(cavepath, 'samplesetup_short2.py')
     >>> print open(setupfile).read()
     import z3c.testsetup

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py	2008-02-02 15:20:33 UTC (rev 83424)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py	2008-02-02 15:30:13 UTC (rev 83425)
@@ -6,8 +6,8 @@
 from zope.testing import doctest, cleanup, renormalizing
 import zope.component.eventtesting
 
-TESTFILES = ['basicsetup.py', 'functionalsetup.py', 'unittestsetup.py',
-             'utils.py']
+TESTFILES = ['basicsetup.txt', 'functionaldoctestsetup.txt',
+             'unitdoctestsetup.txt', 'util.txt']
 
 def setUpZope(test):
     zope.component.eventtesting.setUp(test)
@@ -41,7 +41,7 @@
         sys.modules.update(test.globs['saved-sys-info'][2])
     suites = [
         doctest.DocFileSuite(
-        'testrunner.txt',
+        os.path.join('..', 'testrunner.txt'),
         setUp=setUp, tearDown=tearDown,
         optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE,
         checker=checker),
@@ -53,8 +53,8 @@
 
 def suiteFromFile(filename):
     suite = unittest.TestSuite()
-    dottedname = 'z3c.testsetup.tests.%s' % (filename[:-3],)
-    test = doctest.DocTestSuite(dottedname,
+    dottedname = os.path.join('..', filename) #'../%s' % (filename[:],)
+    test = doctest.DocFileSuite(dottedname,
                                 setUp=setUpZope,
                                 tearDown=cleanUpZope,
                                 checker=checker,

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/unitdoctestsetup.txt
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/unitdoctestsetup.txt	2008-02-02 15:20:33 UTC (rev 83424)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/unitdoctestsetup.txt	2008-02-02 15:30:13 UTC (rev 83425)
@@ -171,7 +171,7 @@
 available as an object attribute::
 
     >>> setup.regexp_list
-    ['^\\\\s*:(T|t)est-(L|l)ayer:\\\\s*(unit)\\\\s*']
+    ['^\\s*:(T|t)est-(L|l)ayer:\\s*(unit)\\s*']
 
 This is the default value of unit test setups.