Commit d4e8c111 authored by Xavier Thompson's avatar Xavier Thompson

[fix] zc.recipe.egg: Fix ls(eggs) tests

Depending on the test environment, pip, setuptools and wheel dists
may be installed as .egg or .egg-link and may be files or folders.
parent 5b0b1d0d
...@@ -91,9 +91,9 @@ Now, if we look at the buildout eggs directory: ...@@ -91,9 +91,9 @@ Now, if we look at the buildout eggs directory:
>>> ls(sample_buildout, 'eggs') >>> ls(sample_buildout, 'eggs')
d demo-0.2-py2.3.egg d demo-0.2-py2.3.egg
d demoneeded-1.1-py2.3.egg d demoneeded-1.1-py2.3.egg
- pip.egg-link ...pip...
- setuptools.egg-link ...setuptools...
- wheel.egg-link ...wheel...
d zc.buildout-1.0-py2.3.egg d zc.buildout-1.0-py2.3.egg
We see that we got an egg for demo that met the requirement, as well We see that we got an egg for demo that met the requirement, as well
...@@ -282,9 +282,9 @@ We didn't get an update for demo: ...@@ -282,9 +282,9 @@ We didn't get an update for demo:
>>> ls(sample_buildout, 'eggs') >>> ls(sample_buildout, 'eggs')
d demo-0.2-py2.3.egg d demo-0.2-py2.3.egg
d demoneeded-1.1-py2.3.egg d demoneeded-1.1-py2.3.egg
- pip.egg-link ...pip...
- setuptools.egg-link ...setuptools...
- wheel.egg-link ...wheel...
d zc.buildout-1.0-py2.3.egg d zc.buildout-1.0-py2.3.egg
If we run the buildout on the default online and newest modes, If we run the buildout on the default online and newest modes,
...@@ -302,9 +302,9 @@ Then we'll get a new demo egg: ...@@ -302,9 +302,9 @@ Then we'll get a new demo egg:
d demo-0.2-py2.3.egg d demo-0.2-py2.3.egg
d demo-0.3-py2.3.egg d demo-0.3-py2.3.egg
d demoneeded-1.1-py2.3.egg d demoneeded-1.1-py2.3.egg
- pip.egg-link ...pip...
- setuptools.egg-link ...setuptools...
- wheel.egg-link ...wheel...
d zc.buildout-1.0-py2.4.egg d zc.buildout-1.0-py2.4.egg
The script is updated too: The script is updated too:
......
...@@ -56,9 +56,9 @@ The installed egg has the slapospatched001 marker ...@@ -56,9 +56,9 @@ The installed egg has the slapospatched001 marker
>>> ls(sample_buildout, 'eggs') >>> ls(sample_buildout, 'eggs')
d demoneeded-1.1+slapospatched001-pyN.N.egg d demoneeded-1.1+slapospatched001-pyN.N.egg
- pip.egg-link ...pip...
- setuptools.egg-link ...setuptools...
- wheel.egg-link ...wheel...
zc.buildout.egg zc.buildout.egg
The code of the egg has been patched: The code of the egg has been patched:
...@@ -117,9 +117,9 @@ The installed egg has the slapospatched001 marker ...@@ -117,9 +117,9 @@ The installed egg has the slapospatched001 marker
>>> ls(sample_buildout, 'eggs') >>> ls(sample_buildout, 'eggs')
d demo-0.3-pyN.N.egg d demo-0.3-pyN.N.egg
d demoneeded-1.1+slapospatched001-pyN.N.egg d demoneeded-1.1+slapospatched001-pyN.N.egg
- pip.egg-link ...pip...
- setuptools.egg-link ...setuptools...
- wheel.egg-link ...wheel...
zc.buildout.egg zc.buildout.egg
If we run the demo script we see the patch was applied: If we run the demo script we see the patch was applied:
......
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