Commit 4d58e156 authored by jim's avatar jim

A change in revision 105585 caused selecting-python.txt test to

fail. The change had to do with the way setuptools was installed.
This seems to explain the changed test output, which is incidental to
what's tested. This test *was* only run for Python 2.5.

I've changed the test to run whenever Python 2.4 isn't used and
updated the test to reflect the new output.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@109504 62d5b8a3-27da-0310-9561-8e5933582275
parent 6c887abf
...@@ -55,8 +55,6 @@ Now, if we run the buildout: ...@@ -55,8 +55,6 @@ Now, if we run the buildout:
Getting distribution for 'demo<0.3'. Getting distribution for 'demo<0.3'.
Got demo 0.2. Got demo 0.2.
Getting distribution for 'demoneeded'. Getting distribution for 'demoneeded'.
Getting distribution for 'setuptools'.
Got setuptools 0.6.
Got demoneeded 1.2c1. Got demoneeded 1.2c1.
Generated script '/sample-buildout/bin/demo'. Generated script '/sample-buildout/bin/demo'.
Generated interpreter '/sample-buildout/bin/py-demo'. Generated interpreter '/sample-buildout/bin/py-demo'.
...@@ -66,7 +64,6 @@ we'll get the Python 2.4 eggs for demo and demoneeded: ...@@ -66,7 +64,6 @@ we'll get the Python 2.4 eggs for demo and demoneeded:
>>> ls(sample_buildout, 'eggs') >>> ls(sample_buildout, 'eggs')
- demo-0.2-py2.4.egg - demo-0.2-py2.4.egg
- demoneeded-1.2c1-py2.4.egg - demoneeded-1.2c1-py2.4.egg
d setuptools-0.6-py2.4.egg
d setuptools-0.6-py2.5.egg d setuptools-0.6-py2.5.egg
- zc.buildout-1.0-py2.5.egg - zc.buildout-1.0-py2.5.egg
......
...@@ -92,7 +92,7 @@ def test_suite(): ...@@ -92,7 +92,7 @@ def test_suite():
)) ))
if sys.version_info[:2] == (2, 5): if sys.version_info[:2] != (2, 4):
# Only run selecting python tests if not 2.4, since # Only run selecting python tests if not 2.4, since
# 2.4 is the alternate python used in the tests. # 2.4 is the alternate python used in the tests.
suite.addTest( suite.addTest(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment