[Checkins] SVN: z3c.recipe.compattest/trunk/ The z3c.recipe.scripts.scripts recipe behind zc.recipe.testrunner.TestRunner does not accept plain dicts, so we wrap the options in a _BackwardsSupportOptions object.

[Jan-Jaap Driessen]

Log message for revision 117253:
  The z3c.recipe.scripts.scripts recipe behind zc.recipe.testrunner.TestRunner does not accept plain dicts, so we wrap the options in a _BackwardsSupportOptions object.
  
  

Changed:
  U   z3c.recipe.compattest/trunk/CHANGES.txt
  U   z3c.recipe.compattest/trunk/buildout.cfg
  U   z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/README.txt
  U   z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py
  U   z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py

-=-
Modified: z3c.recipe.compattest/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.compattest/trunk/CHANGES.txt	2010-10-05 15:29:53 UTC (rev 117252)
+++ z3c.recipe.compattest/trunk/CHANGES.txt	2010-10-05 15:46:28 UTC (rev 117253)
@@ -8,6 +8,9 @@
 - Updated test set up, to run with newer ``zope.testing`` version which no
   longer includes testrunner.
 
+- The z3c.recipe.scripts.scripts recipe behind zc.recipe.testrunner.TestRunner
+  does not accept plain dicts, so we wrap the options in a
+  _BackwardsSupportOptions object.
 
 0.12.2 (2010-02-24)
 ===================

Modified: z3c.recipe.compattest/trunk/buildout.cfg
===================================================================
--- z3c.recipe.compattest/trunk/buildout.cfg	2010-10-05 15:29:53 UTC (rev 117252)
+++ z3c.recipe.compattest/trunk/buildout.cfg	2010-10-05 15:46:28 UTC (rev 117253)
@@ -21,4 +21,4 @@
 packages = zope.dottedname z3c.recipe.compattest
 
 [versions]
-zc.buildout = 1.4.4
+zc.buildout = 1.5.1

Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/README.txt
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/README.txt	2010-10-05 15:29:53 UTC (rev 117252)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/README.txt	2010-10-05 15:46:28 UTC (rev 117253)
@@ -54,8 +54,8 @@
 declared a (superfluous) test dependency on ``zope.dottedname``, which is
 picked up:
 
->>> cat('bin', 'compattest-z3c.recipe.compattest')
-#!...python...
+>>> cat('parts', 'compattest-z3c.recipe.compattest', 'site-packages', 'site.py')
+"""Append module ...
 ...zope.dottedname...
 
 If we use ``include-dependencies`` instead of just ``include``, our direct
@@ -153,6 +153,6 @@
 ... extra-paths = zope2location/lib/python
 ... """)
 >>> ignore = system(buildout)
->>> cat('bin', 'compattest-z3c.recipe.compattest')
-#!...python...
+>>> cat('parts', 'compattest-z3c.recipe.compattest', 'site-packages', 'site.py')
+"""Append module ...
 ...zope2location/lib/python...

Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py	2010-10-05 15:29:53 UTC (rev 117252)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py	2010-10-05 15:46:28 UTC (rev 117253)
@@ -3,6 +3,7 @@
 import re
 import zc.buildout.easy_install
 import zc.recipe.egg
+from zc.recipe.egg.egg import _BackwardsSupportOption
 import zc.recipe.testrunner
 
 
@@ -34,6 +35,7 @@
 
         # gather options to be passed to the underlying testrunner
         self.testrunner_options = {}
+
         for opt in self.options:
             if opt.startswith(RUNNER_PREFIX):
                 runner_opt = opt[len(RUNNER_PREFIX):]
@@ -61,6 +63,11 @@
             if self.extra_paths:
                 options['extra-paths'] = self.extra_paths
 
+            # The testrunner recipe that we are going to pass these options to
+            # expects the 'query_bool' attribute to be accessible.
+            # See also zc.recipe.egg:Eggs (v1.3.2)
+            options = _BackwardsSupportOption(options)
+
             recipe = zc.recipe.testrunner.TestRunner(
                 self.buildout, '%s-%s' % (self.name, package), options)
             installed.extend(recipe.install())

Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py	2010-10-05 15:29:53 UTC (rev 117252)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py	2010-10-05 15:46:28 UTC (rev 117253)
@@ -24,6 +24,7 @@
         # environment
         zc.buildout.testing.install('zc.recipe.testrunner', test)
         zc.buildout.testing.install('zc.recipe.egg', test)
+        zc.buildout.testing.install('z3c.recipe.scripts', test)
         zc.buildout.testing.install('zope.testing', test)
         zc.buildout.testing.install('zope.testrunner', test)
         zc.buildout.testing.install('zope.interface', test)