Issue #12115: skipping all tests that need threading under a threadless environment

diff --git a/Lib/packaging/tests/test_command_upload_docs.py b/Lib/packaging/tests/test_command_upload_docs.py
index c9147dff30a600de1c29c2da356ba1010c065465..756843e00f18b7ba4c14ae9f58f82c98fc71a8be 100644 (file)
--- a/Lib/packaging/tests/test_command_upload_docs.py
+++ b/Lib/packaging/tests/test_command_upload_docs.py
@@ -11,7 +11,12 @@ from packaging.dist import Distribution
 from packaging.errors import PackagingFileError, PackagingOptionError
 
 from packaging.tests import unittest, support
-from packaging.tests.pypi_server import PyPIServerTestCase
+try:
+    import threading
+    from packaging.tests.pypi_server import PyPIServerTestCase
+except ImportError:
+    threading = None
+    PyPIServerTestCase = object
 
 
 EXPECTED_MULTIPART_OUTPUT = [
@@ -41,6 +46,8 @@ username = real_slim_shady
 password = long_island
 """
 
+
+@unittest.skipIf(threading is None, "Needs threading")
 class UploadDocsTestCase(support.TempdirManager,
                          support.EnvironRestorer,
                          support.LoggingCatcher,

diff --git a/Lib/packaging/tests/test_install.py b/Lib/packaging/tests/test_install.py
index 2c51d19cd68cc02fafa150ce51c492e2c57c145d..8aae4ac29ca4814b48bdcac5cf31825d33d7b9f7 100644 (file)
--- a/Lib/packaging/tests/test_install.py
+++ b/Lib/packaging/tests/test_install.py
@@ -7,7 +7,12 @@ from packaging.pypi.xmlrpc import Client
 from packaging.metadata import Metadata
 
 from packaging.tests.support import LoggingCatcher, TempdirManager, unittest
-from packaging.tests.pypi_server import use_xmlrpc_server
+try:
+    import threading
+    from packaging.tests.pypi_server import use_xmlrpc_server
+except ImportError:
+    threading = None
+    use_xmlrpc_server = None
 
 
 class InstalledDist:
@@ -96,6 +101,7 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase):
         conflict = [(o.name, str(o.version)) for o in output['conflict']]
         return installed, remove, conflict
 
+    @unittest.skipIf(threading is None, 'needs threading')
     @use_xmlrpc_server()
     def test_existing_deps(self, server):
         # Test that the installer get the dependencies from the metadatas
@@ -132,6 +138,7 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase):
         self.assertIn(('towel-stuff', '0.1'), readable_output)
         self.assertIn(('choxie', '2.0.0.9'), readable_output)
 
+    @unittest.skipIf(threading is None, 'needs threading')
     @use_xmlrpc_server()
     def test_upgrade_existing_deps(self, server):
         client = self._get_client(server)
@@ -164,6 +171,7 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase):
         self.assertIn(('bacon', '0.1'), remove)
         self.assertEqual(0, len(output['conflict']))
 
+    @unittest.skipIf(threading is None, 'needs threading')
     @use_xmlrpc_server()
     def test_conflicts(self, server):
         # Tests that conflicts are detected
@@ -202,6 +210,7 @@ class TestInstall(LoggingCatcher, TempdirManager, unittest.TestCase):
         self.assertIn(('bacon', '0.1'), remove)
         self.assertIn(('chicken', '1.1'), conflict)
 
+    @unittest.skipIf(threading is None, 'needs threading')
     @use_xmlrpc_server()
     def test_installation_unexisting_project(self, server):
         # Test that the isntalled raises an exception if the project does not

diff --git a/Lib/packaging/tests/test_pypi_server.py b/Lib/packaging/tests/test_pypi_server.py
index 15c2e6c7ec437d7393389e2a45b3d71f8a8d72b1..1fcbdcbb1f8041b39aa21451fa1821776bece58a 100644 (file)
--- a/Lib/packaging/tests/test_pypi_server.py
+++ b/Lib/packaging/tests/test_pypi_server.py
@@ -5,10 +5,18 @@ import urllib.request
 import urllib.parse
 import urllib.error
 
-from packaging.tests.pypi_server import PyPIServer, PYPI_DEFAULT_STATIC_PATH
+try:
+    import threading
+    from packaging.tests.pypi_server import PyPIServer, PYPI_DEFAULT_STATIC_PATH
+except ImportError:
+    threading = None
+    PyPIServer = None
+    PYPI_DEFAULT_STATIC_PATH = None
+
 from packaging.tests import unittest
 
 
+@unittest.skipIf(threading is None, "Needs threading")
 class PyPIServerTest(unittest.TestCase):
 
     def test_records_requests(self):

diff --git a/Lib/packaging/tests/test_pypi_xmlrpc.py b/Lib/packaging/tests/test_pypi_xmlrpc.py
index e27c7b380c1a2788f4a7af0e154752adeddbd271..5c67db98d97f41493883bd42eefce9eb83f64fde 100644 (file)
--- a/Lib/packaging/tests/test_pypi_xmlrpc.py
+++ b/Lib/packaging/tests/test_pypi_xmlrpc.py
@@ -3,9 +3,16 @@
 from packaging.pypi.xmlrpc import Client, InvalidSearchField, ProjectNotFound
 
 from packaging.tests import unittest
-from packaging.tests.pypi_server import use_xmlrpc_server
 
+try:
+    import threading
+    from packaging.tests.pypi_server import use_xmlrpc_server
+except ImportError:
+    threading = None
+    use_xmlrpc_server = None
 
+
+@unittest.skipIf(threading is None, "Needs threading")
 class TestXMLRPCClient(unittest.TestCase):
     def _get_client(self, server, *args, **kwargs):
         return Client(server.full_address, *args, **kwargs)