From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Thu, 29 Jan 2009 23:54:06 +0000 (+0000)
Subject: Merged revisions 69106 via svnmerge from
X-Git-Tag: v3.1a1~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b18b936e797379b13a15604a76bbb9e1e0bcf5fe;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 69106 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69106 | tarek.ziade | 2009-01-30 00:49:17 +0100 (Fri, 30 Jan 2009) | 1 line

  fixed test_make_distribution so it runs on any platform, as long as tar an gzip are available
........
---

diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index 96ec381ec600..0d839b5c6e9a 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -10,7 +10,7 @@ from distutils.command.sdist import sdist
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
-from distutils.spawn import spawn
+from distutils.spawn import find_executable
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -111,15 +111,12 @@ class sdistTestCase(PyPIRCCommandTestCase):
 
     def test_make_distribution(self):
 
-        self._init_tmp_pkg()
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
 
-        # check if tar is installed under win32
-        if sys.platform == 'win32':
-            try:
-                spawn('tar --help')
-            except DistutilsExecError:
-                # let's return, no need to go further
-                return
+        self._init_tmp_pkg()
 
         # now building a sdist
         dist = Distribution()