[Checkins] SVN: grok/trunk/ Actually using zope.testing 3.7.6. A recent branch merge pinned it to 3.7.0 in the buildout.

[Reinout van Rees]

Log message for revision 102034:
  Actually using zope.testing 3.7.6.  A recent branch merge pinned it to 3.7.0 in the buildout.
  Changed testrunner.run() call in the testsetup tests to testrunner.run_internal() as run() now always does a sys.exit() in recent zope.testing versions.

Changed:
  U   grok/trunk/buildout.cfg
  U   grok/trunk/src/grok/tests/testsetup/testsetup.py

-=-
Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg	2009-07-20 08:49:56 UTC (rev 102033)
+++ grok/trunk/buildout.cfg	2009-07-20 11:43:44 UTC (rev 102034)
@@ -17,7 +17,6 @@
 extensions = buildout.dumppickedversions
 
 [versions]
-zope.testing = 3.7.0
 
 [docs]
 recipe = zc.recipe.egg

Modified: grok/trunk/src/grok/tests/testsetup/testsetup.py
===================================================================
--- grok/trunk/src/grok/tests/testsetup/testsetup.py	2009-07-20 08:49:56 UTC (rev 102033)
+++ grok/trunk/src/grok/tests/testsetup/testsetup.py	2009-07-20 11:43:44 UTC (rev 102034)
@@ -430,7 +430,7 @@
 
     The testrunner is ready. Let's start it::
 
-       >>> testrunner.run(defaults)
+       >>> testrunner.run_internal(defaults)
        Running samplesetup1.CustomSampleLayer tests:
          Set up samplesetup1.CustomSampleLayer in ... seconds.
          Ran 2 tests with 0 failures and 0 errors in ... seconds.
@@ -462,7 +462,7 @@
        ...     '--tests-pattern', '^samplesetup2$',
        ...     ]
        >>> sys.argv = 'test -f '.split()
-       >>> testrunner.run(defaults)
+       >>> testrunner.run_internal(defaults)
        Running grok.tests.testsetup.cave.CustomLayerFromPath tests:
          Set up grok.tests.testsetup.cave.CustomLayerFromPath in ... seconds.
          Ran 2 tests with 0 failures and 0 errors in ... seconds.
@@ -492,7 +492,7 @@
        ...     '--tests-pattern', '^samplesetup3$',
        ...     ]
        >>> sys.argv = 'test -f '.split()
-       >>> testrunner.run(defaults)
+       >>> testrunner.run_internal(defaults)
        Running grok.tests.testsetup.cave.FunctionalLayer tests:
          Set up grok.tests.testsetup.cave.FunctionalLayer in ... seconds.
          Ran 2 tests with 0 failures and 0 errors in ... seconds.
@@ -525,7 +525,7 @@
        ...     '--tests-pattern', '^samplesetup4$',
        ...     ]
        >>> sys.argv = 'test -f '.split()
-       >>> testrunner.run(defaults)
+       >>> testrunner.run_internal(defaults)
        Running grok.tests.testsetup.cave_to_let.GrokFunctionalLayer tests:
          Set up grok.tests.testsetup.cave_to_let.GrokFunctionalLayer in ... seconds.
          Ran 1 tests with 0 failures and 0 errors in ... seconds.