Commit 76a6052f authored by Adam Groszer's avatar Adam Groszer

Merge pull request #133 from mgedmin/master

Fix test failure due to new setuptools/distribute
parents d5d44ca9 31cb9a1a
...@@ -817,7 +817,7 @@ On the other hand, if we have a regular egg, rather than a develop egg: ...@@ -817,7 +817,7 @@ On the other hand, if we have a regular egg, rather than a develop egg:
>>> ls('eggs') # doctest: +ELLIPSIS >>> ls('eggs') # doctest: +ELLIPSIS
- foox-0.0.0-py2.4.egg - foox-0.0.0-py2.4.egg
- setuptools.eggpyN.N.egg d setuptools.eggpyN.N.egg
... ...
We do not get a warning, but we do get setuptools included in the working set: We do not get a warning, but we do get setuptools included in the working set:
...@@ -3421,6 +3421,7 @@ def test_suite(): ...@@ -3421,6 +3421,7 @@ def test_suite():
r'We have a develop egg: \1 V'), r'We have a develop egg: \1 V'),
(re.compile('Picked: setuptools = \S+'), (re.compile('Picked: setuptools = \S+'),
'Picked: setuptools = V'), 'Picked: setuptools = V'),
(re.compile('[-d] setuptools'), '- setuptools'),
(re.compile(r'\\[\\]?'), '/'), (re.compile(r'\\[\\]?'), '/'),
(re.compile( (re.compile(
'-q develop -mxN -d "/sample-buildout/develop-eggs'), '-q develop -mxN -d "/sample-buildout/develop-eggs'),
......
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