Commit 9bedbc96 authored by Xavier Thompson's avatar Xavier Thompson

[fix] Fix repeatability tests

parent 5d3e1a57
...@@ -194,6 +194,7 @@ versions: ...@@ -194,6 +194,7 @@ versions:
... parts = foo ... parts = foo
... find-links = %s ... find-links = %s
... allow-picked-versions = false ... allow-picked-versions = false
... newest = false
... ...
... [versions] ... [versions]
... eggs = 2.2 ... eggs = 2.2
...@@ -270,6 +271,8 @@ version number: ...@@ -270,6 +271,8 @@ version number:
>>> setuptools_version = pkg_resources.working_set.find(req).version >>> setuptools_version = pkg_resources.working_set.find(req).version
>>> req = pkg_resources.Requirement.parse('pip') >>> req = pkg_resources.Requirement.parse('pip')
>>> pip_version = pkg_resources.working_set.find(req).version >>> pip_version = pkg_resources.working_set.find(req).version
>>> req = pkg_resources.Requirement.parse('wheel')
>>> wheel_version = pkg_resources.working_set.find(req).version
If you set the ``show-picked-versions`` option, buildout will print If you set the ``show-picked-versions`` option, buildout will print
versions it picked at the end of its run: versions it picked at the end of its run:
...@@ -282,10 +285,14 @@ versions it picked at the end of its run: ...@@ -282,10 +285,14 @@ versions it picked at the end of its run:
... show-picked-versions = true ... show-picked-versions = true
... ...
... [versions] ... [versions]
... pip = %s
... setuptools = %s
... wheel = %s
... ...
... [foo] ... [foo]
... recipe = spam ... recipe = spam
... ''' % join('recipe', 'dist')) ... ''' % (join('recipe', 'dist'),
... pip_version, setuptools_version, wheel_version))
>>> print_(system(buildout), end='') # doctest: +ELLIPSIS >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
Updating foo. Updating foo.
recipe v2 recipe v2
...@@ -306,11 +313,13 @@ When everything is pinned, no output is generated: ...@@ -306,11 +313,13 @@ When everything is pinned, no output is generated:
... [versions] ... [versions]
... pip = %s ... pip = %s
... setuptools = %s ... setuptools = %s
... wheel = %s
... spam = 2 ... spam = 2
... ...
... [foo] ... [foo]
... recipe = spam ... recipe = spam
... ''' % (join('recipe', 'dist'), pip_version, setuptools_version)) ... ''' % (join('recipe', 'dist'),
... pip_version, setuptools_version, wheel_version))
>>> print_(system(buildout), end='') # doctest: +ELLIPSIS >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
Updating foo. Updating foo.
recipe v2 recipe v2
...@@ -331,11 +340,13 @@ and case differences won't impact the pinning: ...@@ -331,11 +340,13 @@ and case differences won't impact the pinning:
... [versions] ... [versions]
... pip = %s ... pip = %s
... setuptools = %s ... setuptools = %s
... wheel = %s
... Spam = 2 ... Spam = 2
... ...
... [foo] ... [foo]
... recipe = spam ... recipe = spam
... ''' % (join('recipe', 'dist'), pip_version, setuptools_version)) ... ''' % (join('recipe', 'dist'),
... pip_version, setuptools_version, wheel_version))
>>> print_(system(buildout), end='') # doctest: +ELLIPSIS >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
Updating foo. Updating foo.
recipe v2 recipe v2
...@@ -349,8 +360,9 @@ extending from that versions file: ...@@ -349,8 +360,9 @@ extending from that versions file:
... [versions] ... [versions]
... pip = %s ... pip = %s
... setuptools = %s ... setuptools = %s
... wheel = %s
... spam = 2 ... spam = 2
... ''' % (pip_version, setuptools_version)) ... ''' % (pip_version, setuptools_version, wheel_version))
>>> write('buildout.cfg', >>> write('buildout.cfg',
... ''' ... '''
... [buildout] ... [buildout]
...@@ -375,7 +387,8 @@ at the end. ...@@ -375,7 +387,8 @@ at the end.
... [versions] ... [versions]
... pip = %s ... pip = %s
... setuptools = %s ... setuptools = %s
... ''' % (pip_version, setuptools_version)) ... wheel = %s
... ''' % (pip_version, setuptools_version, wheel_version))
>>> write('buildout.cfg', >>> write('buildout.cfg',
... ''' ... '''
... [buildout] ... [buildout]
...@@ -420,7 +433,8 @@ printing them to the console): ...@@ -420,7 +433,8 @@ printing them to the console):
... [versions] ... [versions]
... pip = %s ... pip = %s
... setuptools = %s ... setuptools = %s
... ''' % (pip_version, setuptools_version)) ... wheel = %s
... ''' % (pip_version, setuptools_version, wheel_version))
>>> write('buildout.cfg', >>> write('buildout.cfg',
... ''' ... '''
... [buildout] ... [buildout]
......
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