Commit 98e8dbe4 authored by Jim Fulton's avatar Jim Fulton

Fixed some spurious test failures resulting of some bits that were

specific to the way I was developing on mac.
parent 725bfb8c
...@@ -777,7 +777,7 @@ You can also pass script initialization code: ...@@ -777,7 +777,7 @@ You can also pass script initialization code:
It will be included in interpreters too: It will be included in interpreters too:
>>> cat(bin, 'py') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS >>> cat(bin, 'py') # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
#!/Users/jim/bin/python3.3 #!/usr/local/bin/python2.7
<BLANKLINE> <BLANKLINE>
import sys import sys
<BLANKLINE> <BLANKLINE>
......
...@@ -2765,8 +2765,8 @@ def bootstrap_honors_relative_paths(): ...@@ -2765,8 +2765,8 @@ def bootstrap_honors_relative_paths():
... relative-paths = true ... relative-paths = true
... ''') ... ''')
>>> _ = system(buildout+' bootstrap') >>> _ = system(buildout+' bootstrap')
>>> cat('bin', 'buildout') >>> cat('bin', 'buildout') # doctest: +ELLIPSIS
#!/Users/jim/bin/python3.3 #!/usr/local/bin/python2.7
<BLANKLINE> <BLANKLINE>
import os import os
<BLANKLINE> <BLANKLINE>
...@@ -2777,7 +2777,7 @@ def bootstrap_honors_relative_paths(): ...@@ -2777,7 +2777,7 @@ def bootstrap_honors_relative_paths():
import sys import sys
sys.path[0:0] = [ sys.path[0:0] = [
join(base, 'eggs/distribute-0.6.30-py2.7.egg'), join(base, 'eggs/distribute-0.6.30-py2.7.egg'),
'/Users/jim/p/zc/buildout/2/src', ...
] ]
<BLANKLINE> <BLANKLINE>
import zc.buildout.buildout import zc.buildout.buildout
...@@ -3258,6 +3258,7 @@ def test_suite(): ...@@ -3258,6 +3258,7 @@ def test_suite():
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.normalize___pycache__, zc.buildout.testing.normalize___pycache__,
zc.buildout.testing.not_found, zc.buildout.testing.not_found,
normalize_bang,
(re.compile(r"Installing 'zc.buildout >=\S+"), 'Installing '), (re.compile(r"Installing 'zc.buildout >=\S+"), 'Installing '),
(re.compile(r'^(\w+\.)*(Missing\w+: )'), '\2'), (re.compile(r'^(\w+\.)*(Missing\w+: )'), '\2'),
(re.compile("buildout: Running \S*setup.py"), (re.compile("buildout: Running \S*setup.py"),
......
...@@ -213,8 +213,8 @@ directory: ...@@ -213,8 +213,8 @@ directory:
zc.buildout 99.99 zc.buildout 99.99
distribute 99.99 distribute 99.99
>>> cat('bin', 'buildout') >>> cat('bin', 'buildout') # doctest +ELL
#!/Users/jim/bin/python3.3 #!/usr/local/bin/python2.7
<BLANKLINE> <BLANKLINE>
import os import os
<BLANKLINE> <BLANKLINE>
......
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