Commit f8954edb authored by Reinout van Rees's avatar Reinout van Rees

Adjusted tests: creation of eggs dir happens earlier now

parent 735aee2d
...@@ -24,9 +24,9 @@ Make sure the bootstrap script actually works:: ...@@ -24,9 +24,9 @@ Make sure the bootstrap script actually works::
... zc.buildout.easy_install._safe_arg(sys.executable)+' '+ ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
... 'bootstrap.py')); print_('X') # doctest: +ELLIPSIS ... 'bootstrap.py')); print_('X') # doctest: +ELLIPSIS
X... X...
Creating directory '/sample/eggs'.
Creating directory '/sample/bin'. Creating directory '/sample/bin'.
Creating directory '/sample/parts'. Creating directory '/sample/parts'.
Creating directory '/sample/eggs'.
Creating directory '/sample/develop-eggs'. Creating directory '/sample/develop-eggs'.
Generated script '/sample/bin/buildout'. Generated script '/sample/bin/buildout'.
... ...
......
...@@ -27,9 +27,9 @@ Some people pass buildout settings to bootstrap. ...@@ -27,9 +27,9 @@ Some people pass buildout settings to bootstrap.
... ' -c'+join('buildout', 'buildout.cfg') ... ' -c'+join('buildout', 'buildout.cfg')
... )); print_('X') # doctest: +ELLIPSIS ... )); print_('X') # doctest: +ELLIPSIS
X... X...
Creating directory '/top/eggs'.
Creating directory '/top/bin'. Creating directory '/top/bin'.
Creating directory '/top/parts'. Creating directory '/top/parts'.
Creating directory '/top/eggs'.
Creating directory '/top/develop-eggs'. Creating directory '/top/develop-eggs'.
Generated script '/top/bin/buildout'. Generated script '/top/bin/buildout'.
... ...
...@@ -52,9 +52,9 @@ They might do it with init, but no worries: ...@@ -52,9 +52,9 @@ They might do it with init, but no worries:
... )); print_('X') # doctest: +ELLIPSIS ... )); print_('X') # doctest: +ELLIPSIS
X... X...
Creating '/top/buildout/buildout.cfg'. Creating '/top/buildout/buildout.cfg'.
Creating directory '/top/eggs'.
Creating directory '/top/bin'. Creating directory '/top/bin'.
Creating directory '/top/parts'. Creating directory '/top/parts'.
Creating directory '/top/eggs'.
Creating directory '/top/develop-eggs'. Creating directory '/top/develop-eggs'.
Generated script '/top/bin/buildout'. Generated script '/top/bin/buildout'.
... ...
......
...@@ -2446,9 +2446,9 @@ provide alternate locations, and even names for these directories. ...@@ -2446,9 +2446,9 @@ provide alternate locations, and even names for these directories.
... )) ... ))
>>> print_(system(buildout), end='') >>> print_(system(buildout), end='')
Creating directory '/sample-alt/basket'.
Creating directory '/sample-alt/scripts'. Creating directory '/sample-alt/scripts'.
Creating directory '/sample-alt/work'. Creating directory '/sample-alt/work'.
Creating directory '/sample-alt/basket'.
Creating directory '/sample-alt/developbasket'. Creating directory '/sample-alt/developbasket'.
Develop: '/sample-buildout/recipes' Develop: '/sample-buildout/recipes'
Uninstalling d4. Uninstalling d4.
...@@ -2482,9 +2482,9 @@ You can also specify an alternate buildout directory: ...@@ -2482,9 +2482,9 @@ You can also specify an alternate buildout directory:
... )) ... ))
>>> print_(system(buildout), end='') >>> print_(system(buildout), end='')
Creating directory '/sample-alt/eggs'.
Creating directory '/sample-alt/bin'. Creating directory '/sample-alt/bin'.
Creating directory '/sample-alt/parts'. Creating directory '/sample-alt/parts'.
Creating directory '/sample-alt/eggs'.
Creating directory '/sample-alt/develop-eggs'. Creating directory '/sample-alt/develop-eggs'.
Develop: '/sample-buildout/recipes' Develop: '/sample-buildout/recipes'
...@@ -2772,9 +2772,9 @@ local buildout scripts. ...@@ -2772,9 +2772,9 @@ local buildout scripts.
... +' -c'+os.path.join(sample_bootstrapped, 'setup.cfg') ... +' -c'+os.path.join(sample_bootstrapped, 'setup.cfg')
... +' init'), end='') ... +' init'), end='')
Creating '/sample-bootstrapped/setup.cfg'. Creating '/sample-bootstrapped/setup.cfg'.
Creating directory '/sample-bootstrapped/eggs'.
Creating directory '/sample-bootstrapped/bin'. Creating directory '/sample-bootstrapped/bin'.
Creating directory '/sample-bootstrapped/parts'. Creating directory '/sample-bootstrapped/parts'.
Creating directory '/sample-bootstrapped/eggs'.
Creating directory '/sample-bootstrapped/develop-eggs'. Creating directory '/sample-bootstrapped/develop-eggs'.
Generated script '/sample-bootstrapped/bin/buildout'. Generated script '/sample-bootstrapped/bin/buildout'.
...@@ -2833,9 +2833,9 @@ if there isn't a configuration file: ...@@ -2833,9 +2833,9 @@ if there isn't a configuration file:
>>> print_(system(buildout >>> print_(system(buildout
... +' -c'+os.path.join(sample_bootstrapped2, 'setup.cfg') ... +' -c'+os.path.join(sample_bootstrapped2, 'setup.cfg')
... +' bootstrap'), end='') ... +' bootstrap'), end='')
Creating directory '/sample-bootstrapped2/eggs'.
Creating directory '/sample-bootstrapped2/bin'. Creating directory '/sample-bootstrapped2/bin'.
Creating directory '/sample-bootstrapped2/parts'. Creating directory '/sample-bootstrapped2/parts'.
Creating directory '/sample-bootstrapped2/eggs'.
Creating directory '/sample-bootstrapped2/develop-eggs'. Creating directory '/sample-bootstrapped2/develop-eggs'.
Generated script '/sample-bootstrapped2/bin/buildout'. Generated script '/sample-bootstrapped2/bin/buildout'.
......
...@@ -154,6 +154,7 @@ created, provided it is within an already existing directory:: ...@@ -154,6 +154,7 @@ created, provided it is within an already existing directory::
... ''' % globals()) ... ''' % globals())
>>> print_(system(buildout), end='') >>> print_(system(buildout), end='')
Creating directory '/cache/newdir'.
Uninstalling eggs. Uninstalling eggs.
>>> ls(cache) >>> ls(cache)
......
...@@ -30,6 +30,7 @@ We'll use the buildout script from our sample buildout: ...@@ -30,6 +30,7 @@ We'll use the buildout script from our sample buildout:
>>> print_(system(buildout+' setup'), end='') >>> print_(system(buildout+' setup'), end='')
... # doctest: +NORMALIZE_WHITESPACE ... # doctest: +NORMALIZE_WHITESPACE
Creating directory '././././eggs'.
Error: The setup command requires the path to a setup script or Error: The setup command requires the path to a setup script or
directory containing a setup script, and its arguments. directory containing a setup script, and its arguments.
......
...@@ -646,9 +646,9 @@ bootstrapping. ...@@ -646,9 +646,9 @@ bootstrapping.
>>> os.chdir(d) >>> os.chdir(d)
>>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout') >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')
... + ' bootstrap'), end='') ... + ' bootstrap'), end='')
Creating directory '/sample-bootstrap/eggs'.
Creating directory '/sample-bootstrap/bin'. Creating directory '/sample-bootstrap/bin'.
Creating directory '/sample-bootstrap/parts'. Creating directory '/sample-bootstrap/parts'.
Creating directory '/sample-bootstrap/eggs'.
Creating directory '/sample-bootstrap/develop-eggs'. Creating directory '/sample-bootstrap/develop-eggs'.
Generated script '/sample-bootstrap/bin/buildout'. Generated script '/sample-bootstrap/bin/buildout'.
""" """
...@@ -673,9 +673,9 @@ def bug_92891_bootstrap_crashes_with_egg_recipe_in_buildout_section(): ...@@ -673,9 +673,9 @@ def bug_92891_bootstrap_crashes_with_egg_recipe_in_buildout_section():
>>> os.chdir(d) >>> os.chdir(d)
>>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout') >>> print_(system(os.path.join(sample_buildout, 'bin', 'buildout')
... + ' bootstrap'), end='') ... + ' bootstrap'), end='')
Creating directory '/sample-bootstrap/eggs'.
Creating directory '/sample-bootstrap/bin'. Creating directory '/sample-bootstrap/bin'.
Creating directory '/sample-bootstrap/parts'. Creating directory '/sample-bootstrap/parts'.
Creating directory '/sample-bootstrap/eggs'.
Creating directory '/sample-bootstrap/develop-eggs'. Creating directory '/sample-bootstrap/develop-eggs'.
Generated script '/sample-bootstrap/bin/buildout'. Generated script '/sample-bootstrap/bin/buildout'.
......
...@@ -175,9 +175,9 @@ directory: ...@@ -175,9 +175,9 @@ directory:
>>> cd(sample_buildout2) >>> cd(sample_buildout2)
>>> print_(system(buildout), end='') >>> print_(system(buildout), end='')
Creating directory '/sample_buildout2/eggs'.
Creating directory '/sample_buildout2/bin'. Creating directory '/sample_buildout2/bin'.
Creating directory '/sample_buildout2/parts'. Creating directory '/sample_buildout2/parts'.
Creating directory '/sample_buildout2/eggs'.
Creating directory '/sample_buildout2/develop-eggs'. Creating directory '/sample_buildout2/develop-eggs'.
Getting distribution for 'zc.buildout>=1.99'. Getting distribution for 'zc.buildout>=1.99'.
Got zc.buildout 99.99. Got zc.buildout 99.99.
......
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