Commit b33683ed authored by Jim Fulton's avatar Jim Fulton

Tweaks to deal with output differences between windows and unix.

parent be208c05
...@@ -526,9 +526,9 @@ We'll start by creating a faux 'python' that executable that prints a ...@@ -526,9 +526,9 @@ We'll start by creating a faux 'python' that executable that prints a
>>> import zc.buildout.easy_install >>> import zc.buildout.easy_install
>>> ws = zc.buildout.easy_install.working_set( >>> ws = zc.buildout.easy_install.working_set(
... ['demo'], sys.executable, ['develop-eggs']) ... ['demo'], sys.executable, ['develop-eggs'])
>>> zc.buildout.easy_install.scripts( >>> bool(zc.buildout.easy_install.scripts(
... ['demo'], ws, sys.executable, 'bin') ... ['demo'], ws, sys.executable, 'bin'))
['bin/demo'] True
>>> print system(join('bin', 'demo')), >>> print system(join('bin', 'demo')),
Python 2.5 Python 2.5
...@@ -1789,7 +1789,7 @@ if sys.version_info > (2, 4): ...@@ -1789,7 +1789,7 @@ if sys.version_info > (2, 4):
... parts = x ... parts = x
... ''') ... ''')
>>> call(buildout) >>> call(buildout) # doctest: +NORMALIZE_WHITESPACE
While: While:
Installing. Installing.
Getting section x. Getting section x.
...@@ -1819,7 +1819,7 @@ if sys.version_info > (2, 4): ...@@ -1819,7 +1819,7 @@ if sys.version_info > (2, 4):
... recipe = zc.buildout.testexit ... recipe = zc.buildout.testexit
... ''') ... ''')
>>> call(buildout) >>> call(buildout) # doctest: +NORMALIZE_WHITESPACE
Develop: '/sample-buildout/.' Develop: '/sample-buildout/.'
While: While:
Installing. Installing.
...@@ -2280,7 +2280,7 @@ def test_suite(): ...@@ -2280,7 +2280,7 @@ def test_suite():
'Picked: \\1 = V.V'), 'Picked: \\1 = V.V'),
(re.compile(r'We have a develop egg: zc.buildout (\S+)'), (re.compile(r'We have a develop egg: zc.buildout (\S+)'),
'We have a develop egg: zc.buildout X.X.'), 'We have a develop egg: zc.buildout X.X.'),
(re.compile(r'\\[\\]?'), '/'),
]) ])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
...@@ -2346,7 +2346,7 @@ def test_suite(): ...@@ -2346,7 +2346,7 @@ def test_suite():
r'We have a develop egg: \1 V'), r'We have a develop egg: \1 V'),
(re.compile('Picked: setuptools = \S+'), (re.compile('Picked: setuptools = \S+'),
'Picked: setuptools = V'), 'Picked: setuptools = V'),
(re.compile(r'\\[\\]?'), '/'),
]), ]),
), ),
)) ))
......
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