mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

skip more tests in packaging if threading is not supported

Browse source
This commit is contained in:
Tarek Ziade 2011-05-23 00:41:27 +02:00
parent a3c1545a2e
commit e5f9cbdaae
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/packaging/tests/test_command_upload.py
View file

@ -7,7 +7,12 @@ from packaging.dist import Distribution
from packaging.errors import PackagingOptionError from packaging.errors import PackagingOptionError
from packaging.tests import unittest, support from packaging.tests import unittest, support
from packaging.tests.pypi_server import PyPIServer, PyPIServerTestCase try:
import threading
from packaging.tests.pypi_server import PyPIServerTestCase
except ImportError:
threading = None
PyPIServerTestCase = unittest.TestCase
PYPIRC_NOPASSWORD = """\ PYPIRC_NOPASSWORD = """\
@ -39,6 +44,7 @@ repository:http://another.pypi/
""" """
@unittest.skipIf(threading is None, 'needs threading')
class UploadTestCase(support.TempdirManager, support.EnvironRestorer, class UploadTestCase(support.TempdirManager, support.EnvironRestorer,
support.LoggingCatcher, PyPIServerTestCase): support.LoggingCatcher, PyPIServerTestCase):

8
Lib/packaging/tests/test_pypi_dist.py
View file

@ -8,7 +8,11 @@ from packaging.pypi.errors import HashDoesNotMatch, UnsupportedHashName
from packaging.tests import unittest from packaging.tests import unittest
from packaging.tests.support import TempdirManager, requires_zlib from packaging.tests.support import TempdirManager, requires_zlib
from packaging.tests.pypi_server import use_pypi_server try:
import threading
from packaging.tests.pypi_server import use_pypi_server
except ImportError:
threading = use_pypi_server = None
def Dist(*args, **kwargs): def Dist(*args, **kwargs):
@ -120,6 +124,7 @@ class TestDistInfo(TempdirManager, unittest.TestCase):
# assert we can't compare dists with different names # assert we can't compare dists with different names
self.assertRaises(TypeError, foo1.__eq__, bar) self.assertRaises(TypeError, foo1.__eq__, bar)
@unittest.skipIf(threading is None, 'needs threading')
@use_pypi_server("downloads_with_md5") @use_pypi_server("downloads_with_md5")
def test_download(self, server): def test_download(self, server):
# Download is possible, and the md5 is checked if given # Download is possible, and the md5 is checked if given
@ -158,6 +163,7 @@ class TestDistInfo(TempdirManager, unittest.TestCase):
hashname="invalid_hashname", hashname="invalid_hashname",
hashval="value") hashval="value")
@unittest.skipIf(threading is None, 'needs threading')
@requires_zlib @requires_zlib
@use_pypi_server('downloads_with_md5') @use_pypi_server('downloads_with_md5')
def test_unpack(self, server): def test_unpack(self, server):

7
Lib/packaging/tests/test_pypi_xmlrpc.py
View file

@ -9,7 +9,12 @@ try:
from packaging.tests.pypi_server import use_xmlrpc_server from packaging.tests.pypi_server import use_xmlrpc_server
except ImportError: except ImportError:
threading = None threading = None
use_xmlrpc_server = None def use_xmlrpc_server():
def _use(func):
def __use(*args, **kw):
return func(*args, **kw)
return __use
return _use
@unittest.skipIf(threading is None, "Needs threading") @unittest.skipIf(threading is None, "Needs threading")