[Python-checkins] cpython (merge 3.5 -> 3.6): Some distutils tests require zlib for creating tar.gz source distribution.

Mon Oct 24 07:54:28 EDT 2016

https://hg.python.org/cpython/rev/7ca0ce963d64
changeset: 104672:7ca0ce963d64
branch: 3.6
parent: 104666:5b779441d03e
parent: 104671:bb9cea3c3e2c
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Oct 23 22:58:06 2016 +0300
summary:
 Some distutils tests require zlib for creating tar.gz source distribution.
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
