Commit 5b0b1d0d authored by Xavier Thompson's avatar Xavier Thompson

[fix] 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 bafc4e50
...@@ -54,10 +54,11 @@ The ``bin`` directory contains scripts:: ...@@ -54,10 +54,11 @@ The ``bin`` directory contains scripts::
The ``eggs`` directory has installed distributions: The ``eggs`` directory has installed distributions:
>>> ls(sample_buildout, 'eggs') >>> print_() or ls(sample_buildout, 'eggs')
- pip.egg-link <BLANKLINE>
- setuptools.egg-link ...pip...
- wheel.egg-link ...setuptools...
...wheel...
- zc.buildout.egg-link - zc.buildout.egg-link
The ``develop-eggs`` and ``parts`` directories are initially empty:: The ``develop-eggs`` and ``parts`` directories are initially empty::
...@@ -3283,11 +3284,12 @@ We also get other buildout artifacts:: ...@@ -3283,11 +3284,12 @@ We also get other buildout artifacts::
>>> ls(sample_bootstrapped, 'bin') >>> ls(sample_bootstrapped, 'bin')
- buildout - buildout
>>> _ = (ls(sample_bootstrapped, 'eggs'), >>> _ = (print_() or ls(sample_bootstrapped, 'eggs'),
... ls(sample_bootstrapped, 'develop-eggs')) ... ls(sample_bootstrapped, 'develop-eggs'))
- pip.egg-link <BLANKLINE>
- setuptools.egg-link ...pip...
- wheel.egg-link ...setuptools...
...wheel...
- zc.buildout.egg-link - zc.buildout.egg-link
(We list both the ``eggs`` and ``develop-eggs`` directories because the (We list both the ``eggs`` and ``develop-eggs`` directories because the
......
...@@ -1021,10 +1021,10 @@ On the other hand, if we have a zipped egg, rather than a develop egg: ...@@ -1021,10 +1021,10 @@ On the other hand, if we have a zipped egg, rather than a develop egg:
- zc.recipe.egg.egg-link - zc.recipe.egg.egg-link
>>> ls('eggs') # doctest: +ELLIPSIS >>> ls('eggs') # doctest: +ELLIPSIS
- foox-0.0.0-py2.4.egg - foox-0.0.0-pyN.N.egg
- pip.egg-link ...pip...
- setuptools.egg-link ...setuptools...
- wheel.egg-link ...wheel...
- zc.buildout.egg-link - zc.buildout.egg-link
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:
......
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