[Checkins] SVN: zc.recipe.testrunner/branches/gary-support-system-python/ basic updates to get tests to pass, and to honor new setting.
Gary Poster
gary.poster at canonical.com
Thu Jul 9 15:52:45 EDT 2009
Log message for revision 101777:
basic updates to get tests to pass, and to honor new setting.
Changed:
_U zc.recipe.testrunner/branches/gary-support-system-python/
U zc.recipe.testrunner/branches/gary-support-system-python/buildout.cfg
U zc.recipe.testrunner/branches/gary-support-system-python/setup.py
U zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/README.txt
U zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/__init__.py
-=-
Property changes on: zc.recipe.testrunner/branches/gary-support-system-python
___________________________________________________________________
Added: svn:externals
+ zc.buildout svn+ssh://svn.zope.org/repos/main/zc.buildout/branches/gary-support-system-python
Modified: zc.recipe.testrunner/branches/gary-support-system-python/buildout.cfg
===================================================================
--- zc.recipe.testrunner/branches/gary-support-system-python/buildout.cfg 2009-07-09 19:51:57 UTC (rev 101776)
+++ zc.recipe.testrunner/branches/gary-support-system-python/buildout.cfg 2009-07-09 19:52:45 UTC (rev 101777)
@@ -1,6 +1,8 @@
[buildout]
parts = test
develop = .
+ zc.buildout
+ zc.buildout/zc.recipe.egg_
[test]
recipe = zc.recipe.testrunner
Modified: zc.recipe.testrunner/branches/gary-support-system-python/setup.py
===================================================================
--- zc.recipe.testrunner/branches/gary-support-system-python/setup.py 2009-07-09 19:51:57 UTC (rev 101776)
+++ zc.recipe.testrunner/branches/gary-support-system-python/setup.py 2009-07-09 19:52:45 UTC (rev 101777)
@@ -29,10 +29,10 @@
include_package_data = True,
package_dir = {'':'src'},
namespace_packages = ['zc', 'zc.recipe'],
- install_requires = ['zc.buildout >=1.2.0',
+ install_requires = ['zc.buildout >=1.4.0dev',
'zope.testing >=3.6.0',
'setuptools',
- 'zc.recipe.egg >=1.2.0',
+ 'zc.recipe.egg >=1.3.0dev',
],
test_suite = name+'.tests.test_suite',
entry_points = {'zc.buildout': ['default = %s:TestRunner' % name]},
Modified: zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/README.txt
===================================================================
--- zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/README.txt 2009-07-09 19:51:57 UTC (rev 101776)
+++ zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/README.txt 2009-07-09 19:52:45 UTC (rev 101777)
@@ -235,17 +235,18 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
- sys.path[0:0] = [
- '/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
- '/usr/local/zope/lib/python',
- ]
+ sys.path[:] = [
+ '/sample-buildout/demo',
+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
+ '/usr/local/zope/lib/python',
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -278,17 +279,18 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
- sys.path[0:0] = [
- '/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
- '/usr/local/zope/lib/python',
- ]
+ sys.path[:] = [
+ '/sample-buildout/demo',
+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
+ '/usr/local/zope/lib/python',
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -333,17 +335,18 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
- sys.path[0:0] = [
- '/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
- '/usr/local/zope/lib/python',
- ]
+ sys.path[:] = [
+ '/sample-buildout/demo',
+ '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
+ '/usr/local/zope/lib/python',
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -395,7 +398,6 @@
Failure in test test (demo.tests.DemoTests)
Traceback (most recent call last):
...
- raise self.failureException, \
AssertionError: '42' != '23'
<BLANKLINE>
<BLANKLINE>
@@ -431,16 +433,17 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
- sys.path[0:0] = [
- '/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
- ]
+ sys.path[:] = [
+ '/sample-buildout/demo',
+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -487,17 +490,18 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
- sys.path[0:0] = [
- '/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
- '/usr/local/zope/lib/python',
- ]
+ sys.path[:] = [
+ '/sample-buildout/demo',
+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
+ '/usr/local/zope/lib/python',
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -535,17 +539,18 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
- sys.path[0:0] = [
- '/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
- '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
- '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
- '/usr/local/zope/lib/python',
- ]
+ sys.path[:] = [
+ '/sample-buildout/demo',
+ '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
+ '/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
+ '/usr/local/zope/lib/python',
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -582,24 +587,25 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import os
<BLANKLINE>
join = os.path.join
- base = os.path.dirname(__file__)
+ base = os.path.dirname(os.path.abspath(__file__))
base = os.path.dirname(base)
<BLANKLINE>
import sys
- sys.path[0:0] = [
- join(base, 'demo'),
- join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
- join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
- join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
- '/usr/local/zope/lib/python',
- join(base, 'sources'),
- ]
+ sys.path[:] = [
+ join(base, 'demo'),
+ join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
+ join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
+ join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
+ '/usr/local/zope/lib/python',
+ join(base, 'sources'),
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
@@ -632,24 +638,25 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo') # doctest: +ELLIPSIS
#!/usr/local/bin/python2.4
<BLANKLINE>
import os
<BLANKLINE>
join = os.path.join
- base = os.path.dirname(__file__)
+ base = os.path.dirname(os.path.abspath(__file__))
base = os.path.dirname(base)
<BLANKLINE>
import sys
- sys.path[0:0] = [
- join(base, 'demo'),
- join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
- join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
- join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
- '/usr/local/zope/lib/python',
- join(base, 'sources'),
- ]
+ sys.path[:] = [
+ join(base, 'demo'),
+ join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
+ join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
+ join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
+ '/usr/local/zope/lib/python',
+ join(base, 'sources'),
+ ...
+ ]
<BLANKLINE>
import os
sys.argv[0] = os.path.abspath(sys.argv[0])
Modified: zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/__init__.py
===================================================================
--- zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/__init__.py 2009-07-09 19:51:57 UTC (rev 101776)
+++ zc.recipe.testrunner/branches/gary-support-system-python/src/zc/recipe/testrunner/__init__.py 2009-07-09 19:52:45 UTC (rev 101777)
@@ -37,6 +37,14 @@
buildout['buildout']['parts-directory'], name)
self.egg = zc.recipe.egg.Egg(buildout, name, options)
+ include_site_packages = self.options.setdefault(
+ 'include-site-packages',
+ self.buildout['buildout'].get('include-site-packages', 'true'))
+ if include_site_packages not in ('true', 'false'):
+ self._error('Invalid value for include-site-packages option: %s',
+ include_site_packages)
+ self.include_site_packages = (include_site_packages=='true')
+
def install(self):
options = self.options
dest = []
@@ -90,6 +98,7 @@
for p in test_paths)
+' ]'),
initialization = initialization,
+ include_site_packages=self.include_site_packages,
relative_paths = self.egg._relative_paths,
))
More information about the Checkins
mailing list