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

src/zc/buildout/tests.py

@@ -3717,6 +3717,8 @@ normalize_bang = (
     '#!/usr/local/bin/python2.4',
     )
 
+hide_distribute_additions = (re.compile('install_dir .+\n'), '')
+
 def test_suite():
     test_suite = [
         doctest.DocFileSuite(
@@ -3728,6 +3730,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('__buildout_signature__ = recipes-\S+'),
                  '__buildout_signature__ = recipes-SSSSSSSSSSS'),
                 (re.compile('executable = [\S ]+python\S*', re.I),
@@ -3758,6 +3761,7 @@ def test_suite():
             checker=renormalizing.RENormalizing([
                 zc.buildout.testing.normalize_path,
                 zc.buildout.testing.normalize_endings,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile(r'\S+buildout.py'), 'buildout.py'),
                 (re.compile(r'line \d+'), 'line NNN'),
                 (re.compile(r'py\(\d+\)'), 'py(NNN)'),
@@ -3774,6 +3778,7 @@ def test_suite():
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
                 normalize_bang,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('99[.]99'), 'NINETYNINE.NINETYNINE'),
                 (re.compile('(zc.buildout|setuptools)-\d+[.]\d+\S*'
                             '-py\d.\d.egg'),
@@ -3804,6 +3809,7 @@ def test_suite():
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
                 normalize_bang,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('extdemo[.]pyd'), 'extdemo.so'),
                 (re.compile('[-d]  (setuptools|distribute)-\S+[.]egg'),
                  'setuptools.egg'),
@@ -3845,6 +3851,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile("buildout: Running \S*setup.py"),
                  'buildout: Running setup.py'),
                 (re.compile('(setuptools|distribute)-\S+-'),
@@ -3882,6 +3889,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('__buildout_signature__ = recipes-\S+'),
                  '__buildout_signature__ = recipes-SSSSSSSSSSS'),
                 (re.compile('[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
@@ -3941,6 +3949,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('(setuptools|distribute)-\S+-'),
                  'setuptools.egg'),
                 (re.compile('zc.buildout-\S+-'),

z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py

@@ -421,6 +421,7 @@ def test_suite():
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
                 zc.buildout.tests.normalize_bang,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'),
                  'zc.buildout.egg'),
                 (re.compile('[-d]  (setuptools|distribute)-[^-]+-'), 'setuptools-X-'),
@@ -442,6 +443,7 @@ def test_suite():
                 zc.buildout.testing.normalize_path,
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
                 ]),
             ),

zc.recipe.egg_/src/zc/recipe/egg/tests.py

@@ -48,6 +48,7 @@ def test_suite():
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
                 zc.buildout.tests.normalize_bang,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
                  'zc.buildout.egg'),
                 (re.compile('[-d]  (setuptools|distribute)-[^-]+-'),
@@ -64,6 +65,7 @@ def test_suite():
             checker=renormalizing.RENormalizing([
                 zc.buildout.testing.normalize_path,
                 zc.buildout.testing.normalize_endings,
+                zc.buildout.tests.hide_distribute_additions,
                 (re.compile('__buildout_signature__ = '
                             'sample-\S+\s+'
                             'zc.recipe.egg-\S+\s+'
@@ -85,6 +87,7 @@ def test_suite():
             checker=renormalizing.RENormalizing([
                zc.buildout.testing.normalize_path,
                zc.buildout.testing.normalize_endings,
+                zc.buildout.tests.hide_distribute_additions,
                (re.compile("(d  ((ext)?demo(needed)?|other)"
                            "-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"),
                 '\\1V.V.egg'),
@@ -107,6 +110,7 @@ def test_suite():
                     zc.buildout.testing.normalize_path,
                     zc.buildout.testing.normalize_endings,
                     zc.buildout.testing.normalize_script,
+                    zc.buildout.tests.hide_distribute_additions,
                     (re.compile('Got (setuptools|distribute) \S+'),
                      'Got setuptools V'),
                     (re.compile('([d-]  )?(setuptools|distribute)-\S+-py'),