Merge fixes

Author: justmobilize

adafruit_connection_manager.py

@@ -150,7 +150,6 @@ def get_radio_socketpool(radio):
                     import ssl  # pylint: disable=import-outside-toplevel
 
                     ssl_context = ssl.create_default_context()
-                    pool.set_interface(radio)
                 except ImportError:
                     # if SSL not on board, default to fake_ssl_context
                     pass

tests/conftest.py

@@ -10,11 +10,6 @@
 import pytest
 
 
-# pylint: disable=unused-argument
-def set_interface(iface):
-    """Helper to set the global internet interface"""
-
-
 class SocketPool:
     name = None
 
@@ -32,6 +27,14 @@ class ESP32SPI_SocketPool(SocketPool):  # pylint: disable=too-few-public-methods
 
 class WIZNET5K_SocketPool(SocketPool):  # pylint: disable=too-few-public-methods
     name = "adafruit_wiznet5k_socketpool"
+    SOCK_STREAM = 0x21
+
+
+class WIZNET5K_With_SSL_SocketPool(
+    SocketPool
+):  # pylint: disable=too-few-public-methods
+    name = "adafruit_wiznet5k_socketpool"
+    SOCK_STREAM = 0x1
 
 
 @pytest.fixture
@@ -62,7 +65,6 @@ 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_socketpool_module.SOCK_STREAM = 0x21
     sys.modules["adafruit_wiznet5k"] = wiznet5k_module
     sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socketpool"] = (
         wiznet5k_socketpool_module
@@ -73,16 +75,17 @@ def adafruit_wiznet5k_socketpool_module():
 
 
 @pytest.fixture
-def adafruit_wiznet5k_with_ssl_socket_module():
+def adafruit_wiznet5k_with_ssl_socketpool_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 = 1
+    wiznet5k_socketpool_module = type(sys)("adafruit_wiznet5k_socketpool")
+    wiznet5k_socketpool_module.SocketPool = WIZNET5K_With_SSL_SocketPool
     sys.modules["adafruit_wiznet5k"] = wiznet5k_module
-    sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socket"] = wiznet5k_socket_module
+    sys.modules["adafruit_wiznet5k.adafruit_wiznet5k_socketpool"] = (
+        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)

tests/get_connection_manager_test.py

@@ -19,7 +19,7 @@ def test_get_connection_manager():
 
 
 def test_different_connection_manager_different_pool(  # pylint: disable=unused-argument
-    circuitpython_socketpool_module, adafruit_esp32spi_socket_module
+    circuitpython_socketpool_module, adafruit_esp32spi_socketpool_module
 ):
     radio_wifi = mocket.MockRadio.Radio()
     radio_esp = mocket.MockRadio.ESP_SPIcontrol()

tests/ssl_context_test.py

@@ -66,7 +66,7 @@ def test_connect_wiznet5k_https_not_supported(  # pylint: disable=unused-argumen
 
 
 def test_connect_wiznet5k_https_supported(  # pylint: disable=unused-argument
-    adafruit_wiznet5k_with_ssl_socket_module,
+    adafruit_wiznet5k_with_ssl_socketpool_module,
 ):
     radio = mocket.MockRadio.WIZNET5K()
     with mock.patch("sys.implementation", (None, WIZNET5K_SSL_SUPPORT_VERSION)):