Merge fixes

Author: justmobilize

tests/conftest.py

@@ -15,22 +15,38 @@ def set_interface(iface):
     """Helper to set the global internet interface"""
 
 
-socketpool_module = type(sys)("socketpool")
-socketpool_module.SocketPool = mocket.MocketPool
-sys.modules["socketpool"] = socketpool_module
-
-esp32spi_module = type(sys)("adafruit_esp32spi")
-esp32spi_socket_module = type(sys)("adafruit_esp32spi_socket")
-esp32spi_socket_module.set_interface = set_interface
-sys.modules["adafruit_esp32spi"] = esp32spi_module
-sys.modules["adafruit_esp32spi.adafruit_esp32spi_socket"] = esp32spi_socket_module
-
-wiznet5k_module = type(sys)("adafruit_wiznet5k")
-wiznet5k_socket_module = type(sys)("adafruit_wiznet5k_socket")
-wiznet5k_socket_module.set_interface = set_interface
-wiznet5k_socket_module.SOCK_STREAM = 0x21
-sys.modules["adafruit_wiznet5k"] = wiznet5k_module
-sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socket"] = wiznet5k_socket_module
+@pytest.fixture
+def circuitpython_socketpool_module():
+    socketpool_module = type(sys)("socketpool")
+    socketpool_module.SocketPool = mocket.MocketPool
+    sys.modules["socketpool"] = socketpool_module
+    yield
+    del sys.modules["socketpool"]
+
+
+@pytest.fixture
+def adafruit_esp32spi_socket_module():
+    esp32spi_module = type(sys)("adafruit_esp32spi")
+    esp32spi_socket_module = type(sys)("adafruit_esp32spi_socket")
+    esp32spi_socket_module.set_interface = set_interface
+    sys.modules["adafruit_esp32spi"] = esp32spi_module
+    sys.modules["adafruit_esp32spi.adafruit_esp32spi_socket"] = esp32spi_socket_module
+    yield
+    del sys.modules["adafruit_esp32spi"]
+    del sys.modules["adafruit_esp32spi.adafruit_esp32spi_socket"]
+
+
+@pytest.fixture
+def adafruit_wiznet5k_socket_module():
+    wiznet5k_module = type(sys)("adafruit_wiznet5k")
+    wiznet5k_socket_module = type(sys)("adafruit_wiznet5k_socket")
+    wiznet5k_socket_module.set_interface = set_interface
+    wiznet5k_socket_module.SOCK_STREAM = 0x21
+    sys.modules["adafruit_wiznet5k"] = wiznet5k_module
+    sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socket"] = wiznet5k_socket_module
+    yield
+    del sys.modules["adafruit_wiznet5k"]
+    del sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socket"]
 
 
 @pytest.fixture(autouse=True)

tests/get_radio_test.py

@@ -13,19 +13,25 @@
 import adafruit_connection_manager
 
 
-def test_get_radio_socketpool_wifi():
+def test_get_radio_socketpool_wifi(  # pylint: disable=unused-argument
+    circuitpython_socketpool_module,
+):
     radio = mocket.MockRadio.Radio()
     socket_pool = adafruit_connection_manager.get_radio_socketpool(radio)
     assert isinstance(socket_pool, mocket.MocketPool)
 
 
-def test_get_radio_socketpool_esp32spi():
+def test_get_radio_socketpool_esp32spi(  # pylint: disable=unused-argument
+    adafruit_esp32spi_socket_module,
+):
     radio = mocket.MockRadio.ESP_SPIcontrol()
     socket_pool = adafruit_connection_manager.get_radio_socketpool(radio)
     assert socket_pool.__name__ == "adafruit_esp32spi_socket"
 
 
-def test_get_radio_socketpool_wiznet5k():
+def test_get_radio_socketpool_wiznet5k(  # pylint: disable=unused-argument
+    adafruit_wiznet5k_socket_module,
+):
     radio = mocket.MockRadio.WIZNET5K()
     with mock.patch("sys.implementation", return_value=[9, 0, 0]):
         socket_pool = adafruit_connection_manager.get_radio_socketpool(radio)
@@ -39,26 +45,34 @@ def test_get_radio_socketpool_unsupported():
     assert "Unsupported radio class" in str(context)
 
 
-def test_get_radio_socketpool_returns_same_one():
+def test_get_radio_socketpool_returns_same_one(  # pylint: disable=unused-argument
+    circuitpython_socketpool_module,
+):
     radio = mocket.MockRadio.Radio()
     socket_pool_1 = adafruit_connection_manager.get_radio_socketpool(radio)
     socket_pool_2 = adafruit_connection_manager.get_radio_socketpool(radio)
     assert socket_pool_1 == socket_pool_2
 
 
-def test_get_radio_ssl_context_wifi():
+def test_get_radio_ssl_context_wifi(  # pylint: disable=unused-argument
+    circuitpython_socketpool_module,
+):
     radio = mocket.MockRadio.Radio()
     ssl_contexts = adafruit_connection_manager.get_radio_ssl_context(radio)
     assert isinstance(ssl_contexts, ssl.SSLContext)
 
 
-def test_get_radio_ssl_context_esp32spi():
+def test_get_radio_ssl_context_esp32spi(  # pylint: disable=unused-argument
+    adafruit_esp32spi_socket_module,
+):
     radio = mocket.MockRadio.ESP_SPIcontrol()
     ssl_contexts = adafruit_connection_manager.get_radio_ssl_context(radio)
     assert isinstance(ssl_contexts, adafruit_connection_manager._FakeSSLContext)
 
 
-def test_get_radio_ssl_context_wiznet5k():
+def test_get_radio_ssl_context_wiznet5k(  # pylint: disable=unused-argument
+    adafruit_wiznet5k_socket_module,
+):
     radio = mocket.MockRadio.WIZNET5K()
     with mock.patch("sys.implementation", return_value=[9, 0, 0]):
         ssl_contexts = adafruit_connection_manager.get_radio_ssl_context(radio)
@@ -72,7 +86,9 @@ def test_get_radio_ssl_context_unsupported():
     assert "Unsupported radio class" in str(context)
 
 
-def test_get_radio_ssl_context_returns_same_one():
+def test_get_radio_ssl_context_returns_same_one(  # pylint: disable=unused-argument
+    circuitpython_socketpool_module,
+):
     radio = mocket.MockRadio.Radio()
     ssl_contexts_1 = adafruit_connection_manager.get_radio_ssl_context(radio)
     ssl_contexts_2 = adafruit_connection_manager.get_radio_ssl_context(radio)

tests/get_socket_test.py

@@ -217,7 +217,9 @@ def test_get_socket_runtime_error_ties_again_only_once():
     free_sockets_mock.assert_called_once()
 
 
-def test_fake_ssl_context_connect():
+def test_fake_ssl_context_connect(  # pylint: disable=unused-argument
+    adafruit_esp32spi_socket_module,
+):
     mock_pool = mocket.MocketPool()
     mock_socket_1 = mocket.Mocket()
     mock_pool.socket.return_value = mock_socket_1
@@ -234,7 +236,9 @@ def test_fake_ssl_context_connect():
     socket._socket.connect.assert_called_once()
 
 
-def test_fake_ssl_context_connect_error():
+def test_fake_ssl_context_connect_error(  # pylint: disable=unused-argument
+    adafruit_esp32spi_socket_module,
+):
     mock_pool = mocket.MocketPool()
     mock_socket_1 = mocket.Mocket()
     mock_pool.socket.return_value = mock_socket_1

tests/fake_ssl_context_test.py renamed to tests/ssl_context_test.py

@@ -2,8 +2,9 @@
 #
 # SPDX-License-Identifier: Unlicense
 
-""" FakeSLLSocket Tests """
+""" SLL Context Tests """
 
+import ssl
 from unittest import mock
 
 import mocket
@@ -12,10 +13,16 @@
 import adafruit_connection_manager
 
 
-def test_connect_https():
+def test_connect_esp32spi_https(  # pylint: disable=unused-argument
+    adafruit_esp32spi_socket_module,
+):
     mock_pool = mocket.MocketPool()
     mock_socket_1 = mocket.Mocket()
-    mock_pool.socket.return_value = mock_socket_1
+    mock_socket_2 = mocket.Mocket()
+    mock_pool.socket.side_effect = [
+        mock_socket_1,
+        mock_socket_2,
+    ]
 
     radio = mocket.MockRadio.ESP_SPIcontrol()
     ssl_context = adafruit_connection_manager.get_radio_ssl_context(radio)
@@ -26,15 +33,23 @@ def test_connect_https():
         mocket.MOCK_HOST_1, 443, "https:", ssl_context=ssl_context
     )
     assert socket != mock_socket_1
+    assert socket != mock_socket_2
     assert socket._socket == mock_socket_1
     assert isinstance(socket, adafruit_connection_manager._FakeSSLSocket)
 
 
-def test_connect_https_not_supported():
-    mock_pool = mocket.MocketPool()
-    mock_socket_1 = mocket.Mocket()
-    mock_pool.socket.return_value = mock_socket_1
+def test_connect_wifi_https(  # pylint: disable=unused-argument
+    circuitpython_socketpool_module,
+):
+    radio = mocket.MockRadio.Radio()
+    ssl_context = adafruit_connection_manager.get_radio_ssl_context(radio)
+    assert isinstance(ssl_context, ssl.SSLContext)
 
+
+def test_connect_wiznet5k_https_not_supported(  # pylint: disable=unused-argument
+    adafruit_wiznet5k_socket_module,
+):
+    mock_pool = mocket.MocketPool()
     radio = mocket.MockRadio.WIZNET5K()
     with mock.patch("sys.implementation", return_value=[9, 0, 0]):
         ssl_context = adafruit_connection_manager.get_radio_ssl_context(radio)