Merge fixes

Author: justmobilize

tests/conftest.py

@@ -44,29 +44,32 @@ def circuitpython_socketpool_module():
 
 
 @pytest.fixture
-def adafruit_esp32spi_socket_module():
+def adafruit_esp32spi_socketpool_module():
     esp32spi_module = type(sys)("adafruit_esp32spi")
     esp32spi_socket_module = type(sys)("adafruit_esp32spi_socketpool")
     esp32spi_socket_module.SocketPool = ESP32SPI_SocketPool
     sys.modules["adafruit_esp32spi"] = esp32spi_module
-    sys.modules["adafruit_esp32spi.adafruit_esp32spi_socketpool"] = esp32spi_socket_module
+    sys.modules["adafruit_esp32spi.adafruit_esp32spi_socketpool"] = (
+        esp32spi_socket_module
+    )
     yield
     del sys.modules["adafruit_esp32spi"]
-    del sys.modules["adafruit_esp32spi.adafruit_esp32spi_socket"]
+    del sys.modules["adafruit_esp32spi.adafruit_esp32spi_socketpool"]
 
 
 @pytest.fixture
-def adafruit_wiznet5k_socket_module():
+def adafruit_wiznet5k_socketpool_module():
     wiznet5k_module = type(sys)("adafruit_wiznet5k")
     wiznet5k_socketpool_module = type(sys)("adafruit_wiznet5k_socketpool")
     wiznet5k_socketpool_module.SocketPool = WIZNET5K_SocketPool
-    wiznet5k_socket_module.SOCK_STREAM = 0x21
+    wiznet5k_socketpool_module.SOCK_STREAM = 0x21
     sys.modules["adafruit_wiznet5k"] = wiznet5k_module
     sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socketpool"] = (
-    wiznet5k_socketpool_module
+        wiznet5k_socketpool_module
+    )
     yield
     del sys.modules["adafruit_wiznet5k"]
-    del sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socket"]
+    del sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socketpool"]
 
 
 @pytest.fixture(autouse=True)
@@ -79,4 +82,3 @@ def reset_connection_manager(monkeypatch):
         "adafruit_connection_manager._global_ssl_contexts",
         {},
     )
-)

tests/get_radio_test.py

@@ -22,15 +22,15 @@ def test_get_radio_socketpool_wifi(  # pylint: disable=unused-argument
 
 
 def test_get_radio_socketpool_esp32spi(  # pylint: disable=unused-argument
-    adafruit_esp32spi_socket_module,
+    adafruit_esp32spi_socketpool_module,
 ):
     radio = mocket.MockRadio.ESP_SPIcontrol()
     socket_pool = adafruit_connection_manager.get_radio_socketpool(radio)
     assert socket_pool.__name__ == "adafruit_esp32spi_socketpool"
 
 
 def test_get_radio_socketpool_wiznet5k(  # pylint: disable=unused-argument
-    adafruit_wiznet5k_socket_module,
+    adafruit_wiznet5k_socketpool_module,
 ):
     radio = mocket.MockRadio.WIZNET5K()
     with mock.patch("sys.implementation", return_value=[9, 0, 0]):
@@ -63,15 +63,15 @@ def test_get_radio_ssl_context_wifi(  # pylint: disable=unused-argument
 
 
 def test_get_radio_ssl_context_esp32spi(  # pylint: disable=unused-argument
-    adafruit_esp32spi_socket_module,
+    adafruit_esp32spi_socketpool_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(  # pylint: disable=unused-argument
-    adafruit_wiznet5k_socket_module,
+    adafruit_wiznet5k_socketpool_module,
 ):
     radio = mocket.MockRadio.WIZNET5K()
     with mock.patch("sys.implementation", return_value=[9, 0, 0]):

tests/get_socket_test.py

@@ -218,7 +218,7 @@ def test_get_socket_runtime_error_ties_again_only_once():
 
 
 def test_fake_ssl_context_connect(  # pylint: disable=unused-argument
-    adafruit_esp32spi_socket_module,
+    adafruit_esp32spi_socketpool_module,
 ):
     mock_pool = mocket.MocketPool()
     mock_socket_1 = mocket.Mocket()
@@ -237,7 +237,7 @@ def test_fake_ssl_context_connect(  # pylint: disable=unused-argument
 
 
 def test_fake_ssl_context_connect_error(  # pylint: disable=unused-argument
-    adafruit_esp32spi_socket_module,
+    adafruit_esp32spi_socketpool_module,
 ):
     mock_pool = mocket.MocketPool()
     mock_socket_1 = mocket.Mocket()

tests/ssl_context_test.py

@@ -13,7 +13,7 @@
 
 
 def test_connect_esp32spi_https(  # pylint: disable=unused-argument
-    adafruit_esp32spi_socket_module,
+    adafruit_esp32spi_socketpool_module,
 ):
     mock_pool = mocket.MocketPool()
     mock_socket_1 = mocket.Mocket()
@@ -46,7 +46,7 @@ def test_connect_wifi_https(  # pylint: disable=unused-argument
 
 
 def test_connect_wiznet5k_https_not_supported(  # pylint: disable=unused-argument
-    adafruit_wiznet5k_socket_module,
+    adafruit_wiznet5k_socketpool_module,
 ):
     mock_pool = mocket.MocketPool()
     radio = mocket.MockRadio.WIZNET5K()