Merge https://github.com/pypa/distutils into bugfix/2232-ubuntu-patchbugfix/2232-ubuntu-patch

2 files changed, 10 insertions, 1 deletions

diff --git a/setuptools/_distutils/tests/test_bdist_dumb.py b/setuptools/_distutils/tests/test_bdist_dumb.py
index 01a233bc..e58d775d 100644
--- a/setuptools/_distutils/tests/test_bdist_dumb.py
+++ b/setuptools/_distutils/tests/test_bdist_dumb.py
@@ -9,6 +9,7 @@ from test.support import run_unittest
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
+from distutils._platform import is_debian
 
 SETUP_PY = """\
 from distutils.core import setup
@@ -85,7 +86,12 @@ class BuildDumbTestCase(support.TempdirManager,
             fp.close()
 
         contents = sorted(filter(None, map(os.path.basename, contents)))
-        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py']
+        egg_info_name = (
+            'foo-0.1.egg-info' if is_debian() else
+            'foo-0.1-py%s.%s.egg-info' % sys.version_info[:2]
+        )
+        wanted = [egg_info_name, 'foo.py']
+
         if not sys.dont_write_bytecode:
             wanted.append('foo.%s.pyc' % sys.implementation.cache_tag)
         self.assertEqual(contents, sorted(wanted))
diff --git a/setuptools/_distutils/tests/test_install.py b/setuptools/_distutils/tests/test_install.py
index eb684a09..907442bb 100644
--- a/setuptools/_distutils/tests/test_install.py
+++ b/setuptools/_distutils/tests/test_install.py
@@ -15,6 +15,7 @@ from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
 from distutils.extension import Extension
+from distutils._platform import is_debian
 
 from distutils.tests import support
 from test import support as test_support
@@ -195,6 +196,7 @@ class InstallTestCase(support.TempdirManager,
         found = [os.path.basename(line) for line in content.splitlines()]
         expected = ['hello.py', 'hello.%s.pyc' % sys.implementation.cache_tag,
                     'sayhi',
+                    'UNKNOWN-0.0.0.egg-info' if is_debian() else
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 
@@ -228,6 +230,7 @@ class InstallTestCase(support.TempdirManager,
 
         found = [os.path.basename(line) for line in content.splitlines()]
         expected = [_make_ext_name('xx'),
+                    'UNKNOWN-0.0.0.egg-info' if is_debian() else
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)