Skip to content

S
slapos.buildout
Commit 1e8e02f2 authored by Gary Poster's avatar Gary Poster
Browse files
Options

hide additional messages from distribute in tests so tests pass with it.

parent 77a3db7d
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 190 deletions
src/zc/buildout/tests.py
View file @ 1e8e02f2
...@@ -3717,6 +3717,8 @@ normalize_bang = ( ...@@ -3717,6 +3717,8 @@ normalize_bang = (
'#!/usr/local/bin/python2.4', '#!/usr/local/bin/python2.4',
) )
hide_distribute_additions = (re.compile('install_dir .+\n'), '')
def test_suite(): def test_suite():
test_suite = [ test_suite = [
doctest.DocFileSuite( doctest.DocFileSuite(
...@@ -3724,44 +3726,46 @@ def test_suite(): ...@@ -3724,44 +3726,46 @@ def test_suite():
setUp=zc.buildout.testing.buildoutSetUp, setUp=zc.buildout.testing.buildoutSetUp,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
(re.compile('__buildout_signature__ = recipes-\S+'), zc.buildout.tests.hide_distribute_additions,
'__buildout_signature__ = recipes-SSSSSSSSSSS'), (re.compile('__buildout_signature__ = recipes-\S+'),
(re.compile('executable = [\S ]+python\S*', re.I), '__buildout_signature__ = recipes-SSSSSSSSSSS'),
'executable = python'), (re.compile('executable = [\S ]+python\S*', re.I),
(re.compile('[-d] (setuptools|distribute)-\S+[.]egg'), 'executable = python'),
'setuptools.egg'), (re.compile('[-d] (setuptools|distribute)-\S+[.]egg'),
(re.compile('zc.buildout(-\S+)?[.]egg(-link)?'), 'setuptools.egg'),
'zc.buildout.egg'), (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
(re.compile('creating \S*setup.cfg'), 'creating setup.cfg'), 'zc.buildout.egg'),
(re.compile('hello\%ssetup' % os.path.sep), 'hello/setup'), (re.compile('creating \S*setup.cfg'), 'creating setup.cfg'),
(re.compile('Picked: (\S+) = \S+'), (re.compile('hello\%ssetup' % os.path.sep), 'hello/setup'),
'Picked: \\1 = V.V'), (re.compile('Picked: (\S+) = \S+'),
(re.compile(r'We have a develop egg: zc.buildout (\S+)'), 'Picked: \\1 = V.V'),
'We have a develop egg: zc.buildout X.X.'), (re.compile(r'We have a develop egg: zc.buildout (\S+)'),
(re.compile(r'\\[\\]?'), '/'), 'We have a develop egg: zc.buildout X.X.'),
(re.compile('WindowsError'), 'OSError'), (re.compile(r'\\[\\]?'), '/'),
(re.compile(r'\[Error \d+\] Cannot create a file ' (re.compile('WindowsError'), 'OSError'),
r'when that file already exists: '), (re.compile(r'\[Error \d+\] Cannot create a file '
'[Errno 17] File exists: ' r'when that file already exists: '),
), '[Errno 17] File exists: '
(re.compile('distribute'), 'setuptools'), ),
]) (re.compile('distribute'), 'setuptools'),
])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
'debugging.txt', 'debugging.txt',
setUp=zc.buildout.testing.buildoutSetUp, setUp=zc.buildout.testing.buildoutSetUp,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
(re.compile(r'\S+buildout.py'), 'buildout.py'), zc.buildout.tests.hide_distribute_additions,
(re.compile(r'line \d+'), 'line NNN'), (re.compile(r'\S+buildout.py'), 'buildout.py'),
(re.compile(r'py\(\d+\)'), 'py(NNN)'), (re.compile(r'line \d+'), 'line NNN'),
]) (re.compile(r'py\(\d+\)'), 'py(NNN)'),
])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
...@@ -3769,28 +3773,29 @@ def test_suite(): ...@@ -3769,28 +3773,29 @@ def test_suite():
setUp=updateSetup, setUp=updateSetup,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
normalize_bang, normalize_bang,
(re.compile('99[.]99'), 'NINETYNINE.NINETYNINE'), zc.buildout.tests.hide_distribute_additions,
(re.compile('(zc.buildout|setuptools)-\d+[.]\d+\S*' (re.compile('99[.]99'), 'NINETYNINE.NINETYNINE'),
'-py\d.\d.egg'), (re.compile('(zc.buildout|setuptools)-\d+[.]\d+\S*'
'\\1.egg'), '-py\d.\d.egg'),
(re.compile('distribute-\d+[.]\d+\S*' '\\1.egg'),
'-py\d.\d.egg'), (re.compile('distribute-\d+[.]\d+\S*'
'setuptools.egg'), '-py\d.\d.egg'),
(re.compile('(zc.buildout|setuptools)( version)? \d+[.]\d+\S*'), 'setuptools.egg'),
'\\1 V.V'), (re.compile('(zc.buildout|setuptools)( version)? \d+[.]\d+\S*'),
(re.compile('distribute( version)? \d+[.]\d+\S*'), '\\1 V.V'),
'setuptools V.V'), (re.compile('distribute( version)? \d+[.]\d+\S*'),
(re.compile('[-d] (setuptools|distribute)'), '- setuptools'), 'setuptools V.V'),
(re.compile('distribute'), 'setuptools'), (re.compile('[-d] (setuptools|distribute)'), '- setuptools'),
(re.compile("\nUnused options for buildout: " (re.compile('distribute'), 'setuptools'),
"'(distribute|setuptools)\-version'\."), (re.compile("\nUnused options for buildout: "
'') "'(distribute|setuptools)\-version'\."),
]) '')
])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
...@@ -3799,28 +3804,29 @@ def test_suite(): ...@@ -3799,28 +3804,29 @@ def test_suite():
setUp=easy_install_SetUp, setUp=easy_install_SetUp,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
normalize_bang, normalize_bang,
(re.compile('extdemo[.]pyd'), 'extdemo.so'), zc.buildout.tests.hide_distribute_additions,
(re.compile('[-d] (setuptools|distribute)-\S+[.]egg'), (re.compile('extdemo[.]pyd'), 'extdemo.so'),
'setuptools.egg'), (re.compile('[-d] (setuptools|distribute)-\S+[.]egg'),
(re.compile(r'\\[\\]?'), '/'), 'setuptools.egg'),
(re.compile(r'\#!\S+\bpython\S*'), '#!/usr/bin/python'), (re.compile(r'\\[\\]?'), '/'),
# Normalize generate_script's Windows interpreter to UNIX: (re.compile(r'\#!\S+\bpython\S*'), '#!/usr/bin/python'),
(re.compile(r'\nimport subprocess\n'), '\n'), # Normalize generate_script's Windows interpreter to UNIX:
(re.compile('subprocess\\.call\\(argv, env=environ\\)'), (re.compile(r'\nimport subprocess\n'), '\n'),
'os.execve(sys.executable, argv, environ)'), (re.compile('subprocess\\.call\\(argv, env=environ\\)'),
(re.compile('distribute'), 'setuptools'), 'os.execve(sys.executable, argv, environ)'),
# Distribute unzips eggs by default. (re.compile('distribute'), 'setuptools'),
(re.compile('\- demoneeded'), 'd demoneeded'), # Distribute unzips eggs by default.
]+(sys.version_info < (2, 5) and [ (re.compile('\- demoneeded'), 'd demoneeded'),
(re.compile('.*No module named runpy.*', re.S), ''), ]+(sys.version_info < (2, 5) and [
(re.compile('.*usage: pdb.py scriptfile .*', re.S), ''), (re.compile('.*No module named runpy.*', re.S), ''),
(re.compile('.*Error: what does not exist.*', re.S), ''), (re.compile('.*usage: pdb.py scriptfile .*', re.S), ''),
] or [])), (re.compile('.*Error: what does not exist.*', re.S), ''),
] or [])),
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
...@@ -3841,35 +3847,36 @@ def test_suite(): ...@@ -3841,35 +3847,36 @@ def test_suite():
setUp=easy_install_SetUp, setUp=easy_install_SetUp,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
(re.compile("buildout: Running \S*setup.py"), zc.buildout.tests.hide_distribute_additions,
'buildout: Running setup.py'), (re.compile("buildout: Running \S*setup.py"),
(re.compile('(setuptools|distribute)-\S+-'), 'buildout: Running setup.py'),
'setuptools.egg'), (re.compile('(setuptools|distribute)-\S+-'),
(re.compile('zc.buildout-\S+-'), 'setuptools.egg'),
'zc.buildout.egg'), (re.compile('zc.buildout-\S+-'),
(re.compile('File "\S+one.py"'), 'zc.buildout.egg'),
'File "one.py"'), (re.compile('File "\S+one.py"'),
(re.compile(r'We have a develop egg: (\S+) (\S+)'), 'File "one.py"'),
r'We have a develop egg: \1 V'), (re.compile(r'We have a develop egg: (\S+) (\S+)'),
(re.compile('Picked: (setuptools|distribute) = \S+'), r'We have a develop egg: \1 V'),
'Picked: setuptools = V'), (re.compile('Picked: (setuptools|distribute) = \S+'),
(re.compile(r'\\[\\]?'), '/'), 'Picked: setuptools = V'),
(re.compile( (re.compile(r'\\[\\]?'), '/'),
'-q develop -mxN -d "/sample-buildout/develop-eggs'), (re.compile(
'-q develop -mxN -d /sample-buildout/develop-eggs' '-q develop -mxN -d "/sample-buildout/develop-eggs'),
), '-q develop -mxN -d /sample-buildout/develop-eggs'
(re.compile(r'^[*]...'), '...'), ),
# for bug_92891_bootstrap_crashes_with_egg_recipe_in_buildout_section (re.compile(r'^[*]...'), '...'),
(re.compile(r"Unused options for buildout: 'eggs' 'scripts'\."), # for bug_92891_bootstrap_crashes_with_egg_recipe_in_buildout_section
"Unused options for buildout: 'scripts' 'eggs'."), (re.compile(r"Unused options for buildout: 'eggs' 'scripts'\."),
(re.compile('distribute'), 'setuptools'), "Unused options for buildout: 'scripts' 'eggs'."),
# Distribute unzips eggs by default. (re.compile('distribute'), 'setuptools'),
(re.compile('\- demoneeded'), 'd demoneeded'), # Distribute unzips eggs by default.
]), (re.compile('\- demoneeded'), 'd demoneeded'),
]),
), ),
zc.buildout.testselectingpython.test_suite(), zc.buildout.testselectingpython.test_suite(),
zc.buildout.rmtree.test_suite(), zc.buildout.rmtree.test_suite(),
...@@ -3878,28 +3885,29 @@ def test_suite(): ...@@ -3878,28 +3885,29 @@ def test_suite():
setUp=zc.buildout.testing.buildoutSetUp, setUp=zc.buildout.testing.buildoutSetUp,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
(re.compile('__buildout_signature__ = recipes-\S+'), zc.buildout.tests.hide_distribute_additions,
'__buildout_signature__ = recipes-SSSSSSSSSSS'), (re.compile('__buildout_signature__ = recipes-\S+'),
(re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'), '__buildout_signature__ = recipes-SSSSSSSSSSS'),
(re.compile('zc.buildout(-\S+)?[.]egg(-link)?'), (re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'),
'zc.buildout.egg'), (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
(re.compile('creating \S*setup.cfg'), 'creating setup.cfg'), 'zc.buildout.egg'),
(re.compile('hello\%ssetup' % os.path.sep), 'hello/setup'), (re.compile('creating \S*setup.cfg'), 'creating setup.cfg'),
(re.compile('Picked: (\S+) = \S+'), (re.compile('hello\%ssetup' % os.path.sep), 'hello/setup'),
'Picked: \\1 = V.V'), (re.compile('Picked: (\S+) = \S+'),
(re.compile(r'We have a develop egg: zc.buildout (\S+)'), 'Picked: \\1 = V.V'),
'We have a develop egg: zc.buildout X.X.'), (re.compile(r'We have a develop egg: zc.buildout (\S+)'),
(re.compile(r'\\[\\]?'), '/'), 'We have a develop egg: zc.buildout X.X.'),
(re.compile('WindowsError'), 'OSError'), (re.compile(r'\\[\\]?'), '/'),
(re.compile(r'\[Error 17\] Cannot create a file ' (re.compile('WindowsError'), 'OSError'),
r'when that file already exists: '), (re.compile(r'\[Error 17\] Cannot create a file '
'[Errno 17] File exists: ' r'when that file already exists: '),
), '[Errno 17] File exists: '
]) ),
])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
'testing_bugfix.txt'), 'testing_bugfix.txt'),
...@@ -3941,6 +3949,7 @@ def test_suite(): ...@@ -3941,6 +3949,7 @@ def test_suite():
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.tests.hide_distribute_additions,
(re.compile('(setuptools|distribute)-\S+-'), (re.compile('(setuptools|distribute)-\S+-'),
'setuptools.egg'), 'setuptools.egg'),
(re.compile('zc.buildout-\S+-'), (re.compile('zc.buildout-\S+-'),
......
z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
View file @ 1e8e02f2
...@@ -416,24 +416,25 @@ def test_suite(): ...@@ -416,24 +416,25 @@ def test_suite():
'README.txt', 'README.txt',
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown, setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.tests.normalize_bang, zc.buildout.tests.normalize_bang,
(re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'), zc.buildout.tests.hide_distribute_additions,
'zc.buildout.egg'), (re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'),
(re.compile('[-d] (setuptools|distribute)-[^-]+-'), 'setuptools-X-'), 'zc.buildout.egg'),
(re.compile(r'(setuptools|distribute)-[\w.]+-py'), 'setuptools-X-py'), (re.compile('[-d] (setuptools|distribute)-[^-]+-'), 'setuptools-X-'),
(re.compile(r'eggs\\\\demo'), 'eggs/demo'), (re.compile(r'(setuptools|distribute)-[\w.]+-py'), 'setuptools-X-py'),
(re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'), (re.compile(r'eggs\\\\demo'), 'eggs/demo'),
(re.compile(r'\#!\S+\bpython\S*'), '#!/usr/bin/python'), (re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
# Normalize generate_script's Windows interpreter to UNIX: (re.compile(r'\#!\S+\bpython\S*'), '#!/usr/bin/python'),
(re.compile(r'\nimport subprocess\n'), '\n'), # Normalize generate_script's Windows interpreter to UNIX:
(re.compile('subprocess\\.call\\(argv, env=environ\\)'), (re.compile(r'\nimport subprocess\n'), '\n'),
'os.execve(sys.executable, argv, environ)'), (re.compile('subprocess\\.call\\(argv, env=environ\\)'),
(re.compile('distribute'), 'setuptools'), 'os.execve(sys.executable, argv, environ)'),
]) (re.compile('distribute'), 'setuptools'),
])
), ),
doctest.DocTestSuite( doctest.DocTestSuite(
setUp=setUp, setUp=setUp,
...@@ -442,6 +443,7 @@ def test_suite(): ...@@ -442,6 +443,7 @@ def test_suite():
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.tests.hide_distribute_additions,
(re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'), (re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
]), ]),
), ),
......
zc.recipe.egg_/src/zc/recipe/egg/tests.py
View file @ 1e8e02f2
...@@ -43,41 +43,43 @@ def test_suite(): ...@@ -43,41 +43,43 @@ def test_suite():
'README.txt', 'README.txt',
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown, setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py, zc.buildout.testing.normalize_egg_py,
zc.buildout.tests.normalize_bang, zc.buildout.tests.normalize_bang,
(re.compile('zc.buildout(-\S+)?[.]egg(-link)?'), zc.buildout.tests.hide_distribute_additions,
'zc.buildout.egg'), (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
(re.compile('[-d] (setuptools|distribute)-[^-]+-'), 'zc.buildout.egg'),
'setuptools-X-'), (re.compile('[-d] (setuptools|distribute)-[^-]+-'),
(re.compile(r'eggs\\\\demo'), 'eggs/demo'), 'setuptools-X-'),
(re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'), (re.compile(r'eggs\\\\demo'), 'eggs/demo'),
# Distribute unzips eggs by default. (re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
(re.compile('\- demoneeded'), 'd demoneeded'), # Distribute unzips eggs by default.
]) (re.compile('\- demoneeded'), 'd demoneeded'),
])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
'api.txt', 'api.txt',
setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown, setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
(re.compile('__buildout_signature__ = ' zc.buildout.tests.hide_distribute_additions,
'sample-\S+\s+' (re.compile('__buildout_signature__ = '
'zc.recipe.egg-\S+\s+' 'sample-\S+\s+'
'(setuptools|distribute)-\S+\s+' 'zc.recipe.egg-\S+\s+'
'zc.buildout-\S+\s*' '(setuptools|distribute)-\S+\s+'
), 'zc.buildout-\S+\s*'
'__buildout_signature__ = sample- zc.recipe.egg-\n'), ),
(re.compile('executable = [\S ]+python\S*', re.I), '__buildout_signature__ = sample- zc.recipe.egg-\n'),
'executable = python'), (re.compile('executable = [\S ]+python\S*', re.I),
(re.compile('find-links = http://localhost:\d+/'), 'executable = python'),
'find-links = http://localhost:8080/'), (re.compile('find-links = http://localhost:\d+/'),
(re.compile('index = http://localhost:\d+/index'), 'find-links = http://localhost:8080/'),
'index = http://localhost:8080/index'), (re.compile('index = http://localhost:\d+/index'),
]) 'index = http://localhost:8080/index'),
])
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
'custom.txt', 'custom.txt',
...@@ -85,6 +87,7 @@ def test_suite(): ...@@ -85,6 +87,7 @@ def test_suite():
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.tests.hide_distribute_additions,
(re.compile("(d ((ext)?demo(needed)?|other)" (re.compile("(d ((ext)?demo(needed)?|other)"
"-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"), "-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"),
'\\1V.V.egg'), '\\1V.V.egg'),
...@@ -104,21 +107,22 @@ def test_suite(): ...@@ -104,21 +107,22 @@ def test_suite():
setUp=setUpSelecting, setUp=setUpSelecting,
tearDown=zc.buildout.testing.buildoutTearDown, tearDown=zc.buildout.testing.buildoutTearDown,
checker=renormalizing.RENormalizing([ checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_path, zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings, zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script, zc.buildout.testing.normalize_script,
(re.compile('Got (setuptools|distribute) \S+'), zc.buildout.tests.hide_distribute_additions,
'Got setuptools V'), (re.compile('Got (setuptools|distribute) \S+'),
(re.compile('([d-] )?(setuptools|distribute)-\S+-py'), 'Got setuptools V'),
'setuptools-V-py'), (re.compile('([d-] )?(setuptools|distribute)-\S+-py'),
(re.compile('-py2[.][0-35-9][.]'), 'py2.5.'), 'setuptools-V-py'),
(re.compile('zc.buildout-\S+[.]egg'), (re.compile('-py2[.][0-35-9][.]'), 'py2.5.'),
'zc.buildout.egg'), (re.compile('zc.buildout-\S+[.]egg'),
(re.compile('zc.buildout[.]egg-link'), 'zc.buildout.egg'),
'zc.buildout.egg'), (re.compile('zc.buildout[.]egg-link'),
# Distribute unzips eggs by default. 'zc.buildout.egg'),
(re.compile('\- demoneeded'), 'd demoneeded'), # Distribute unzips eggs by default.
]), (re.compile('\- demoneeded'), 'd demoneeded'),
]),
), ),
) )
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7