Commit 0bd5a3fe authored by Serhiy Storchaka's avatar Serhiy Storchaka

Some distutils tests require zlib for creating tar.gz source distribution.

parent 50c5908a
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
import unittest import unittest
import sys import sys
import os import os
import tempfile from test.support import run_unittest, requires_zlib
import shutil
from test.support import run_unittest
from distutils.core import Distribution from distutils.core import Distribution
from distutils.command.bdist_rpm import bdist_rpm from distutils.command.bdist_rpm import bdist_rpm
...@@ -48,6 +46,7 @@ class BuildRpmTestCase(support.TempdirManager, ...@@ -48,6 +46,7 @@ class BuildRpmTestCase(support.TempdirManager,
# spurious sdtout/stderr output under Mac OS X # spurious sdtout/stderr output under Mac OS X
@unittest.skipUnless(sys.platform.startswith('linux'), @unittest.skipUnless(sys.platform.startswith('linux'),
'spurious sdtout/stderr output under Mac OS X') 'spurious sdtout/stderr output under Mac OS X')
@requires_zlib
@unittest.skipIf(find_executable('rpm') is None, @unittest.skipIf(find_executable('rpm') is None,
'the rpm command is not found') 'the rpm command is not found')
@unittest.skipIf(find_executable('rpmbuild') is None, @unittest.skipIf(find_executable('rpmbuild') is None,
...@@ -90,6 +89,7 @@ class BuildRpmTestCase(support.TempdirManager, ...@@ -90,6 +89,7 @@ class BuildRpmTestCase(support.TempdirManager,
# spurious sdtout/stderr output under Mac OS X # spurious sdtout/stderr output under Mac OS X
@unittest.skipUnless(sys.platform.startswith('linux'), @unittest.skipUnless(sys.platform.startswith('linux'),
'spurious sdtout/stderr output under Mac OS X') 'spurious sdtout/stderr output under Mac OS X')
@requires_zlib
# http://bugs.python.org/issue1533164 # http://bugs.python.org/issue1533164
@unittest.skipIf(find_executable('rpm') is None, @unittest.skipIf(find_executable('rpm') is None,
'the rpm command is not found') 'the rpm command is not found')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment