Commit d889e07d authored by Jim Fulton's avatar Jim Fulton

Make exception expectation even vaguer. Sigh.

Sort dict-based data for consistent output.
parent 136fa15a
...@@ -465,8 +465,7 @@ leave previously created paths in place: ...@@ -465,8 +465,7 @@ leave previously created paths in place:
An internal error occured due to a bug in either zc.buildout or in a An internal error occured due to a bug in either zc.buildout or in a
recipe being used: recipe being used:
Traceback (most recent call last): Traceback (most recent call last):
... ... exists...
OSError: ... exists...
We meant to create a directory bins, but typed bin. Now foo was We meant to create a directory bins, but typed bin. Now foo was
left behind. left behind.
...@@ -497,8 +496,7 @@ If we fix the typo: ...@@ -497,8 +496,7 @@ If we fix the typo:
An internal error occured due to a bug in either zc.buildout or in a An internal error occured due to a bug in either zc.buildout or in a
recipe being used: recipe being used:
Traceback (most recent call last): Traceback (most recent call last):
... ... exists...
OSError: ... exists...
Now they fail because foo exists, because it was left behind. Now they fail because foo exists, because it was left behind.
...@@ -585,8 +583,7 @@ When we rerun the buildout: ...@@ -585,8 +583,7 @@ When we rerun the buildout:
An internal error occured due to a bug in either zc.buildout or in a An internal error occured due to a bug in either zc.buildout or in a
recipe being used: recipe being used:
Traceback (most recent call last): Traceback (most recent call last):
... ... exists...
OSError: ... exists...
we get the same error, but we don't get the directory left behind: we get the same error, but we don't get the directory left behind:
...@@ -661,8 +658,7 @@ directories will be created: ...@@ -661,8 +658,7 @@ directories will be created:
An internal error occured due to a bug in either zc.buildout or in a An internal error occured due to a bug in either zc.buildout or in a
recipe being used: recipe being used:
Traceback (most recent call last): Traceback (most recent call last):
... ... exists...
OSError: ... exists...
>>> os.path.exists('foo') >>> os.path.exists('foo')
False False
...@@ -1137,7 +1133,7 @@ extension that prints out the options. ...@@ -1137,7 +1133,7 @@ extension that prints out the options.
... import sys ... import sys
... def ext(buildout): ... def ext(buildout):
... sys.stdout.write(str( ... sys.stdout.write(str(
... [part['option'] for name, part in buildout.items() ... [part['option'] for name, part in sorted(buildout.items())
... if name.startswith('part')])+'\\n') ... if name.startswith('part')])+'\\n')
... """) ... """)
......
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