[Python-checkins] cpython (merge default -> default): Merge heads
serhiy.storchaka
python-checkins at python.org
Mon Oct 24 07:54:28 EDT 2016
https://hg.python.org/cpython/rev/7e65a78b3aac
changeset: 104675:7e65a78b3aac
parent: 104669:de8c4673249a
parent: 104673:59dbf2a6e7a4
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Oct 24 14:53:36 2016 +0300
summary:
Merge heads
files:
Lib/distutils/tests/test_bdist_rpm.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py
--- a/Lib/distutils/tests/test_bdist_rpm.py
+++ b/Lib/distutils/tests/test_bdist_rpm.py
@@ -3,7 +3,7 @@
import unittest
import sys
import os
-from test.support import run_unittest
+from test.support import run_unittest, requires_zlib
from distutils.core import Distribution
from distutils.command.bdist_rpm import bdist_rpm
@@ -44,6 +44,7 @@
# spurious sdtout/stderr output under Mac OS X
@unittest.skipUnless(sys.platform.startswith('linux'),
'spurious sdtout/stderr output under Mac OS X')
+ @requires_zlib
@unittest.skipIf(find_executable('rpm') is None,
'the rpm command is not found')
@unittest.skipIf(find_executable('rpmbuild') is None,
@@ -86,6 +87,7 @@
# spurious sdtout/stderr output under Mac OS X
@unittest.skipUnless(sys.platform.startswith('linux'),
'spurious sdtout/stderr output under Mac OS X')
+ @requires_zlib
# http://bugs.python.org/issue1533164
@unittest.skipIf(find_executable('rpm') is None,
'the rpm command is not found')
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list