[tmp] fix tests after buildout-eggs

src/zc/buildout/testing.py

@@ -550,7 +550,7 @@ def install(project, destination):
 
     dist = pkg_resources.working_set.find(
         pkg_resources.Requirement.parse(project))
-    if dist.location.endswith('.egg'):
+    if dist.location.endswith('.egg') or dist.location.endswith('.buildout-egg'):
         destination = os.path.join(destination,
                                    os.path.basename(dist.location),
                                    )
@@ -606,6 +606,11 @@ normalize_egg_py = (
     '-pyN.N.egg',
     )
 
+normalize_buildout_egg_py = (
+    re.compile(r'-py\d[.]\d+(-\S+)?\.buildout-egg'),
+    '-pyN.N.buildout-egg',
+    )
+
 normalize_exception_type_for_python_2_and_3 = (
     re.compile(r'^(\w+\.)*([A-Z][A-Za-z0-9]+Error: )'),
     '\2')

src/zc/buildout/tests/bootstrap.txt

@@ -47,7 +47,7 @@ Make sure the bootstrap script actually works::
 
     >>> print_('X'); ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
     X...
-    d  zc.buildout-...egg
+    d  zc.buildout-...buildout-egg
 
 By default it gets the latest version::
 
@@ -57,8 +57,8 @@ By default it gets the latest version::
     >>> with open(buildout_script) as f: print_(f.read()) # doctest: +ELLIPSIS
     #...
     sys.path[0:0] = [
-      '/sample/eggs/zc.buildout-22.0.0...egg',
-      '/sample/eggs/setuptools-...egg'...
+      '/sample/eggs/zc.buildout-22.0.0...buildout-egg',
+      '/sample/eggs/setuptools-...buildout-egg'...
       ]...
 
 Now trying the ``--buildout-version`` option, that let you define a version
@@ -88,8 +88,8 @@ Let's make sure the generated ``buildout`` script uses it::
     >>> with open(buildout_script) as f: print_(f.read()) # doctest: +ELLIPSIS
     #...
     sys.path[0:0] = [
-      '/sample/eggs/zc.buildout-2.0.0...egg',
-      '/sample/eggs/setuptools-...egg'...
+      '/sample/eggs/zc.buildout-2.0.0...buildout-egg',
+      '/sample/eggs/setuptools-...buildout-egg'...
       ]...
 
 Now trying the ``--setuptools-version`` option, that lets you define a version
@@ -108,8 +108,8 @@ Let's make sure the generated ``buildout`` script uses it::
     >>> with open(buildout_script) as f: print_(f.read()) # doctest: +ELLIPSIS
     #...
     sys.path[0:0] = [
-      '/sample/eggs/zc.buildout-...egg',
-      '/sample/eggs/setuptools-31.0.0...egg'...
+      '/sample/eggs/zc.buildout-...buildout-egg',
+      '/sample/eggs/setuptools-31.0.0...buildout-egg'...
       ]...
 
 Now let's try specifying both ``zc.buildout`` and ``setuptools`` to versions
@@ -126,8 +126,8 @@ Let's make sure the generated ``buildout`` script uses it::
     >>> with open(buildout_script) as f: print_(f.read()) # doctest: +ELLIPSIS
     #...
     sys.path[0:0] = [
-      '/sample/eggs/zc.buildout-2.0.0...egg',
-      '/sample/eggs/setuptools-31.0.0...egg'...
+      '/sample/eggs/zc.buildout-2.0.0...buildout-egg',
+      '/sample/eggs/setuptools-31.0.0...buildout-egg'...
       ]...
 
 For a completely offline install we want to avoid downloading ``ez_setup.py``,
@@ -158,8 +158,8 @@ specify the setuptools version, and to reuse the setuptools zipfile::
     >>> with open(buildout_script) as f: print_(f.read()) # doctest: +ELLIPSIS
     #...
     sys.path[0:0] = [
-      '/sample/eggs/zc.buildout-2.0.0...egg',
-      '/sample/eggs/setuptools-32.1.0...egg'...
+      '/sample/eggs/zc.buildout-2.0.0...buildout-egg',
+      '/sample/eggs/setuptools-32.1.0...buildout-egg'...
       ]...
 
 You can ask ``bootstrap.py`` for its version. This is really the day the last

src/zc/buildout/tests/buildout.txt

@@ -3150,7 +3150,7 @@ already, but let's review them and touch on some we haven't discussed:
 
       [buildout]
       ...
-      find-links = /some/path/someegg-1.0.0-py2.3.egg
+      find-links = /some/path/someegg-1.0.0-py2.3.buildout-egg
 
     Any number of locations can be specified in the ``find-links`` option::
 
@@ -3159,7 +3159,7 @@ already, but let's review them and touch on some we haven't discussed:
       find-links =
           http://download.zope.org/distribution/
           /some/otherpath
-          /some/path/someegg-1.0.0-py2.3.egg
+          /some/path/someegg-1.0.0-py2.3.buildout-egg
 
 ``install-from-cache``
     A download cache can be used as the basis of application source releases.

src/zc/buildout/tests/dependencylinks.txt

@@ -78,7 +78,7 @@ buildout to see where the egg comes from this time.
     >>> from glob import glob
     >>> from os.path import join
     >>> def remove_demoneeded_egg():
-    ...     for egg in glob(join(sample_buildout, 'eggs', 'demoneeded*.egg')):
+    ...     for egg in glob(join(sample_buildout, 'eggs', 'demoneeded*.buildout-egg')):
     ...         remove(sample_buildout, 'eggs', egg)
     >>> remove_demoneeded_egg()
     >>> print_(system(buildout), end='') # doctest: +ELLIPSIS

src/zc/buildout/tests/easy_install.txt

@@ -138,7 +138,7 @@ And the actual eggs were added to the eggs directory.
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
 
 If we remove the version restriction on demo, but specify a false
 value for newest, no new distributions will be installed:
@@ -148,7 +148,7 @@ value for newest, no new distributions will be installed:
     ...     newest=False)
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
 
 If we leave off the newest option, we'll get an update for demo:
 
@@ -157,7 +157,7 @@ If we leave off the newest option, we'll get an update for demo:
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
     d  demo-0.3-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
 
 Note that we didn't get the newest versions available.  There were
 release candidates for newer versions of both packages. By default,
@@ -180,8 +180,8 @@ The old setting is returned.
     d  demo-0.2-py2.4.egg
     d  demo-0.3-py2.4.egg
     d  demo-0.4rc1-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  demoneeded-1.2rc1-py2.4.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  demoneeded-1.2rc1-py2.4.buildout-egg
 
 Let's put the setting back to the default.
 
@@ -207,9 +207,9 @@ dependencies.  We might do this to specify a specific version.
     d  demo-0.2-py2.4.egg
     d  demo-0.3-py2.4.egg
     d  demo-0.4rc1-py2.4.egg
-    d  demoneeded-1.0-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  demoneeded-1.2rc1-py2.4.egg
+    d  demoneeded-1.0-py2.4.buildout-egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  demoneeded-1.2rc1-py2.4.buildout-egg
     d  other-1.0-py2.4.egg
 
     >>> rmdir(dest)
@@ -264,8 +264,8 @@ Let's check that the uppercase dist is installed.
     demoneeded 1.1
     MIXEDCASE 0.5
     >>> ls(dest)
-    d  MIXEDCASE-0.5-pyN.N.egg
-    d  demoneeded-1.1-py2.4.egg
+    d  MIXEDCASE-0.5-pyN.N.buildout-egg
+    d  demoneeded-1.1-py2.4.buildout-egg
 
 And cleanup.
 
@@ -619,7 +619,7 @@ The demo script run the entry point defined in the demo egg:
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
-      '/sample-install/demoneeded-1.1-py2.4.egg',
+      '/sample-install/demoneeded-1.1-py2.4.buildout-egg',
       ]
     <BLANKLINE>
     import eggrecipedemo
@@ -656,7 +656,7 @@ rather than passing a requirement:
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
-      '/sample-install/demoneeded-1.1-py2.4.egg',
+      '/sample-install/demoneeded-1.1-py2.4.buildout-egg',
       ]
     <BLANKLINE>
     import eggrecipedemo
@@ -701,7 +701,7 @@ the path set:
     <BLANKLINE>
     sys.path[0:0] = [
       '/sample-install/demo-0.3-pyN.N.egg',
-      '/sample-install/demoneeded-1.1-pyN.N.egg',
+      '/sample-install/demoneeded-1.1-pyN.N.buildout-egg',
       ]
     <BLANKLINE>
     _interactive = True
@@ -816,7 +816,7 @@ to be included in the a generated script:
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
-      '/sample-install/demoneeded-1.1-py2.4.egg',
+      '/sample-install/demoneeded-1.1-py2.4.buildout-egg',
       '/foo',
       ]
     <BLANKLINE>
@@ -841,7 +841,7 @@ parentheses in the call:
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
-      '/sample-install/demoneeded-1.1-py2.4.egg',
+      '/sample-install/demoneeded-1.1-py2.4.buildout-egg',
       ]
     <BLANKLINE>
     import eggrecipedemo
@@ -865,7 +865,7 @@ You can also pass script initialization code:
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
-      '/sample-install/demoneeded-1.1-py2.4.egg',
+      '/sample-install/demoneeded-1.1-py2.4.buildout-egg',
       ]
     <BLANKLINE>
     import os
@@ -885,7 +885,7 @@ It will be included in interpreters too:
     <BLANKLINE>
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py3.3.egg',
-      '/sample-install/demoneeded-1.1-py3.3.egg',
+      '/sample-install/demoneeded-1.1-py3.3.buildout-egg',
       ]
     <BLANKLINE>
     import os
@@ -930,7 +930,7 @@ to pass a common base directory of the scripts and eggs:
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      join(base, 'eggs/demoneeded-1.1-pyN.N.egg'),
+      join(base, 'eggs/demoneeded-1.1-pyN.N.buildout-egg'),
       join(base, 'eggs/demo-0.3-pyN.N.egg'),
       '/ba',
       join(base, 'bar'),
@@ -964,7 +964,7 @@ We specified an interpreter and its paths are adjusted too:
     import sys
     <BLANKLINE>
     sys.path[0:0] = [
-      join(base, 'eggs/demoneeded-1.1-pyN.N.egg'),
+      join(base, 'eggs/demoneeded-1.1-pyN.N.buildout-egg'),
       join(base, 'eggs/demo-0.3-pyN.N.egg'),
       '/ba',
       join(base, 'bar'),
@@ -1215,7 +1215,7 @@ distribution:
     ...   'extdemo', dest,
     ...   {'include_dirs': os.path.join(sample_buildout, 'include')},
     ...   links=[link_server], index=link_server+'index/')
-    ['/sample-install/extdemo-1.4-py2.4-unix-i686.egg']
+    ['/sample-install/extdemo-1.4-py2.4-unix-i686.buildout-egg']
 
 The function returns the list of eggs
 
@@ -1224,9 +1224,9 @@ Now if we look in our destination directory, we see we have an extdemo egg:
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
     d  demo-0.3-py2.4.egg
-    d  demoneeded-1.0-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  extdemo-1.4-py2.4-unix-i686.egg
+    d  demoneeded-1.0-py2.4.buildout-egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  extdemo-1.4-py2.4-unix-i686.buildout-egg
 
 Let's update our link server with a new version of extdemo:
 
@@ -1262,14 +1262,14 @@ If we run build with newest set to False, we won't get an update:
     ...   {'include_dirs': os.path.join(sample_buildout, 'include')},
     ...   links=[link_server], index=link_server+'index/',
     ...   newest=False)
-    ['/sample-install/extdemo-1.4-py2.4-linux-i686.egg']
+    ['/sample-install/extdemo-1.4-py2.4-linux-i686.buildout-egg']
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
     d  demo-0.3-py2.4.egg
-    d  demoneeded-1.0-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  extdemo-1.4-py2.4-unix-i686.egg
+    d  demoneeded-1.0-py2.4.buildout-egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  extdemo-1.4-py2.4-unix-i686.buildout-egg
 
 But if we run it with the default True setting for newest, then we'll
 get an updated egg:
@@ -1278,15 +1278,15 @@ get an updated egg:
     ...   'extdemo', dest,
     ...   {'include_dirs': os.path.join(sample_buildout, 'include')},
     ...   links=[link_server], index=link_server+'index/')
-    ['/sample-install/extdemo-1.5-py2.4-unix-i686.egg']
+    ['/sample-install/extdemo-1.5-py2.4-unix-i686.buildout-egg']
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
     d  demo-0.3-py2.4.egg
-    d  demoneeded-1.0-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  extdemo-1.4-py2.4-unix-i686.egg
-    d  extdemo-1.5-py2.4-unix-i686.egg
+    d  demoneeded-1.0-py2.4.buildout-egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  extdemo-1.4-py2.4-unix-i686.buildout-egg
+    d  extdemo-1.5-py2.4-unix-i686.buildout-egg
 
 The versions option also influences the versions used.  For example,
 if we specify a version for extdemo, then that will be used, even
@@ -1302,10 +1302,10 @@ first:
     ...   {'include_dirs': os.path.join(sample_buildout, 'include')},
     ...   links=[link_server], index=link_server+'index/',
     ...   versions=dict(extdemo='1.4'))
-    ['/sample-install/extdemo-1.4-py2.4-unix-i686.egg']
+    ['/sample-install/extdemo-1.4-py2.4-unix-i686.buildout-egg']
 
     >>> ls(dest)
-    d  extdemo-1.4-py2.4-unix-i686.egg
+    d  extdemo-1.4-py2.4-unix-i686.buildout-egg
 
 Handling custom build options for extensions in develop eggs
 ------------------------------------------------------------
@@ -1355,7 +1355,7 @@ Now if we look in our destination directory, we see we have an extdemo
 egg link:
 
     >>> ls(dest)
-    d  extdemo-1.4-py2.4-unix-i686.egg
+    d  extdemo-1.4-py2.4-unix-i686.buildout-egg
     -  extdemo.egg-link
 
 And that the source directory contains the compiled extension:
@@ -1414,14 +1414,14 @@ Now, if we install demo, and extdemo:
     ...   links=[link_server], index=link_server+'index/')
     GET 404 /index/extdemo/
     GET 200 /extdemo-1.5.zip
-    ['/sample-install/extdemo-1.5-py2.4-linux-i686.egg']
+    ['/sample-install/extdemo-1.5-py2.4-linux-i686.buildout-egg']
 
 Not only will we get eggs in our destination directory:
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  extdemo-1.5-py2.4-linux-i686.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  extdemo-1.5-py2.4-linux-i686.buildout-egg
 
 But we'll get distributions in the cache directory:
 
@@ -1453,12 +1453,12 @@ Now when we install the distributions:
     ...   {'include_dirs': os.path.join(sample_buildout, 'include')},
     ...   links=[link_server], index=link_server+'index/')
     GET 404 /index/extdemo/
-    ['/sample-install/extdemo-1.5-py2.4-linux-i686.egg']
+    ['/sample-install/extdemo-1.5-py2.4-linux-i686.buildout-egg']
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
-    d  extdemo-1.5-py2.4-linux-i686.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
+    d  extdemo-1.5-py2.4-linux-i686.buildout-egg
 
 Note that we didn't download the distributions from the link server.
 
@@ -1513,7 +1513,7 @@ recreate the destination directory, and reinstall demo:
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
 
 This time, we didn't download from or even query the link server.
 

src/zc/buildout/tests/test_all.py

@@ -1943,7 +1943,7 @@ def install_source_dist_with_bad_py():
     X
 
     >>> ls('eggs') # doctest: +ELLIPSIS
-    d  badegg-1-py2.4.egg
+    d  badegg-1-py2.4.buildout-egg
     ...
 
     >>> ls('bin')
@@ -1967,7 +1967,7 @@ def version_requirements_in_build_honored():
     ...   {'include-dirs': os.path.join(sample_buildout, 'include')},
     ...   links=[link_server], index=link_server+'index/',
     ...   newest=False)
-    ['/sample-install/extdemo-1.4-py2.4-linux-i686.egg']
+    ['/sample-install/extdemo-1.4-py2.4-linux-i686.buildout-egg']
 
     '''
 
@@ -2173,7 +2173,7 @@ def bug_61890_file_urls_dont_seem_to_work_in_find_dash_links():
 
     >>> ls(dest)
     d  demo-0.2-py2.4.egg
-    d  demoneeded-1.1-py2.4.egg
+    d  demoneeded-1.1-py2.4.buildout-egg
 
     """
 
@@ -2954,7 +2954,7 @@ def pyc_and_pyo_files_have_correct_paths():
 
     >>> print_(system(join('bin', 'py')+ ' t.py'), end='')
     /sample-buildout/eggs/demo-0.3-py2.4.egg/eggrecipedemo.py
-    /sample-buildout/eggs/demoneeded-1.1-py2.4.egg/eggrecipedemoneeded.py
+    /sample-buildout/eggs/demoneeded-1.1-py2.4.buildout-egg/eggrecipedemoneeded.py
     """
 
 def dont_mess_with_standard_dirs_with_variable_refs():
@@ -3530,7 +3530,7 @@ def test_abi_tag_eggs():
     True
     >>> ls('eggs', abi_tag)
     d  demo-0.3-py3.7.egg
-    d  demoneeded-1.1-py3.7.egg
+    d  demoneeded-1.1-py3.7.buildout-egg
     """
 
 def test_buildout_doesnt_keep_adding_itself_to_versions():
@@ -3732,6 +3732,7 @@ def test_suite():
                     zc.buildout.testing.normalize_endings,
                     zc.buildout.testing.normalize_script,
                     zc.buildout.testing.normalize_egg_py,
+                    zc.buildout.testing.normalize_buildout_egg_py,
                     zc.buildout.testing.not_found,
                     zc.buildout.testing.adding_find_link,
                     zc.buildout.testing.python27_warning,
@@ -3746,11 +3747,11 @@ def test_suite():
                     (re.compile(r'executable = [\S ]+python\S*', re.I),
                      'executable = python'),
                     (re.compile(r'[-d]  (setuptools|setuptools)-\S+[.]egg'),
-                     'setuptools.egg'),
-                    (re.compile(r'pip-\S+[.]egg'), 'pip.egg'),
-                    (re.compile(r'wheel-\S+[.]egg'), 'wheel.egg'),
+                     'setuptools.buildout-egg'),
+                    (re.compile(r'pip-\S+[.]egg'), 'pip.buildout-egg'),
+                    (re.compile(r'wheel-\S+[.]egg'), 'wheel.buildout-egg'),
                     (re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'),
-                     'zc.buildout.egg'),
+                     'zc.buildout.buildout-egg'),
                     (re.compile(r'creating \S*setup.cfg'), 'creating setup.cfg'),
                     (re.compile(r'hello\%ssetup' % os.path.sep), 'hello/setup'),
                     (re.compile(r'Picked: (\S+) = \S+'),
@@ -3783,6 +3784,7 @@ def test_suite():
                zc.buildout.testing.normalize_endings,
                zc.buildout.testing.normalize_script,
                zc.buildout.testing.normalize_egg_py,
+               zc.buildout.testing.normalize_buildout_egg_py,
                zc.buildout.testing.not_found,
                zc.buildout.testing.adding_find_link,
                zc.buildout.testing.easyinstall_deprecated,
@@ -3794,9 +3796,9 @@ def test_suite():
                #  ''),
                (re.compile(r'__buildout_signature__ = recipes-\S+'),
                 '__buildout_signature__ = recipes-SSSSSSSSSSS'),
-               (re.compile(r'[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
+               (re.compile(r'[-d]  setuptools-\S+[.]egg'), 'setuptools.buildout-egg'),
                (re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'),
-                'zc.buildout.egg'),
+                'zc.buildout.buildout-egg'),
                (re.compile(r'creating \S*setup.cfg'), 'creating setup.cfg'),
                (re.compile(r'hello\%ssetup' % os.path.sep), 'hello/setup'),
                (re.compile(r'Picked: (\S+) = \S+'),
@@ -3846,12 +3848,13 @@ def test_suite():
             optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
             checker=renormalizing.RENormalizing([
                 (re.compile(r'(zc.buildout|setuptools)-\d+[.]\d+\S*'
-                            r'-py\d.\d+.egg'),
-                 '\\1.egg'),
+                            r'-py\d.\d+.buildout-egg'),
+                 '\\1.buildout-egg'),
                 zc.buildout.testing.normalize_path,
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.testing.normalize_buildout_egg_py,
                 zc.buildout.testing.not_found,
                 zc.buildout.testing.adding_find_link,
                 zc.buildout.testing.easyinstall_deprecated,
@@ -3885,6 +3888,7 @@ def test_suite():
                 zc.buildout.testing.normalize_path,
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.testing.normalize_buildout_egg_py,
                 zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
                 zc.buildout.testing.normalize_open_in_generated_script,
                 zc.buildout.testing.adding_find_link,
@@ -3897,7 +3901,7 @@ def test_suite():
                 zc.buildout.testing.warnings_warn,
                 normalize_bang,
                 normalize_S,
-                (re.compile(r'[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
+                (re.compile(r'[-d]  setuptools-\S+[.]egg'), 'setuptools.buildout-egg'),
                 (re.compile(r'\\[\\]?'), '/'),
                 (re.compile('(\n?)-  ([a-zA-Z_.-]+)\n-  \\2.exe\n'),
                  '\\1-  \\2\n'),
@@ -3940,6 +3944,7 @@ def test_suite():
                 zc.buildout.testing.normalize_endings,
                 zc.buildout.testing.normalize_script,
                 zc.buildout.testing.normalize_egg_py,
+                zc.buildout.testing.normalize_buildout_egg_py,
                 zc.buildout.testing.normalize___pycache__,
                 zc.buildout.testing.not_found,
                 zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
@@ -3955,11 +3960,11 @@ def test_suite():
                 (re.compile(r"buildout: Running \S*setup.py"),
                  'buildout: Running setup.py'),
                 (re.compile(r'pip-\S+-'),
-                 'pip.egg'),
+                 'pip.buildout-egg'),
                 (re.compile(r'setuptools-\S+-'),
-                 'setuptools.egg'),
+                 'setuptools.buildout-egg'),
                 (re.compile(r'zc.buildout-\S+-'),
-                 'zc.buildout.egg'),
+                 'zc.buildout.buildout-egg'),
                 (re.compile(r'pip = \S+'), 'pip = 20.0.0'),
                 (re.compile(r'setuptools = \S+'), 'setuptools = 0.7.99'),
                 (re.compile(r'File "\S+one.py"'),
@@ -3999,6 +4004,7 @@ def test_suite():
                zc.buildout.testing.normalize_endings,
                zc.buildout.testing.normalize_script,
                zc.buildout.testing.normalize_egg_py,
+               zc.buildout.testing.normalize_buildout_egg_py,
                zc.buildout.testing.not_found,
                zc.buildout.testing.adding_find_link,
                zc.buildout.testing.easyinstall_deprecated,
@@ -4007,9 +4013,9 @@ def test_suite():
                zc.buildout.testing.warnings_warn,
                (re.compile(r'__buildout_signature__ = recipes-\S+'),
                 '__buildout_signature__ = recipes-SSSSSSSSSSS'),
-               (re.compile(r'[-d]  setuptools-\S+[.]egg'), 'setuptools.egg'),
+               (re.compile(r'[-d]  setuptools-\S+[.]egg'), 'setuptools.buildout-egg'),
                (re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'),
-                'zc.buildout.egg'),
+                'zc.buildout.buildout-egg'),
                (re.compile(r'creating \S*setup.cfg'), 'creating setup.cfg'),
                (re.compile(r'hello\%ssetup' % os.path.sep), 'hello/setup'),
                (re.compile(r'Picked: (\S+) = \S+'),

src/zc/buildout/tests/test_extras.py

@@ -72,6 +72,7 @@ def test_suite():
             zc.buildout.testing.normalize_endings,
             zc.buildout.testing.normalize_script,
             zc.buildout.testing.normalize_egg_py,
+            zc.buildout.testing.normalize_buildout_egg_py,
             zc.buildout.testing.normalize___pycache__,
             zc.buildout.testing.not_found,
             zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
@@ -87,11 +88,11 @@ def test_suite():
             (re.compile(r"buildout: Running \S*setup.py"),
              'buildout: Running setup.py'),
             (re.compile(r'pip-\S+-'),
-             'pip.egg'),
+             'pip.buildout-egg'),
             (re.compile(r'setuptools-\S+-'),
-             'setuptools.egg'),
+             'setuptools.buildout-egg'),
             (re.compile(r'zc.buildout-\S+-'),
-             'zc.buildout.egg'),
+             'zc.buildout.buildout-egg'),
             (re.compile(r'pip = \S+'), 'pip = 20.0.0'),
             (re.compile(r'setuptools = \S+'), 'setuptools = 0.7.99'),
             (re.compile(r'File "\S+one.py"'),

src/zc/buildout/tests/test_increment.py

@@ -400,6 +400,7 @@ def test_suite():
             zc.buildout.testing.normalize_endings,
             zc.buildout.testing.normalize_script,
             zc.buildout.testing.normalize_egg_py,
+            zc.buildout.testing.normalize_buildout_egg_py,
             zc.buildout.testing.normalize___pycache__,
             zc.buildout.testing.not_found,
             zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
@@ -415,11 +416,11 @@ def test_suite():
             (re.compile(r"buildout: Running \S*setup.py"),
              'buildout: Running setup.py'),
             (re.compile(r'pip-\S+-'),
-             'pip.egg'),
+             'pip.buildout-egg'),
             (re.compile(r'setuptools-\S+-'),
-             'setuptools.egg'),
+             'setuptools.buildout-egg'),
             (re.compile(r'zc.buildout-\S+-'),
-             'zc.buildout.egg'),
+             'zc.buildout.buildout-egg'),
             (re.compile(r'pip = \S+'), 'pip = 20.0.0'),
             (re.compile(r'setuptools = \S+'), 'setuptools = 0.7.99'),
             (re.compile(r'File "\S+one.py"'),