diff --git a/adafruit_connection_manager.py b/adafruit_connection_manager.py index cc70f3f..0745505 100644 --- a/adafruit_connection_manager.py +++ b/adafruit_connection_manager.py @@ -93,7 +93,8 @@ def create_fake_ssl_context( * `Adafruit AirLift FeatherWing – ESP32 WiFi Co-Processor `_ """ - socket_pool.set_interface(iface) + if hasattr(socket_pool, "set_interface"): + socket_pool.set_interface(iface) return _FakeSSLContext(iface) @@ -126,7 +127,9 @@ def get_radio_socketpool(radio): ssl_context = create_fake_ssl_context(pool, radio) elif class_name == "WIZNET5K": - import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool # pylint: disable=import-outside-toplevel + import adafruit_wiznet5k.adafruit_wiznet5k_socketpool as socketpool # pylint: disable=import-outside-toplevel + + pool = socketpool.SocketPool(radio) # Note: SSL/TLS connections are not supported by the Wiznet5k library at this time ssl_context = create_fake_ssl_context(pool, radio) diff --git a/tests/conftest.py b/tests/conftest.py index 2d9bb0a..c42acb3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -25,7 +25,12 @@ def set_interface(iface): 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_socketpool_module = type(sys)("adafruit_wiznet5k_socketpool") +wiznet5k_socketpool_module.SocketPool = mocket.MocketPool +wiznet5k_socketpool_module.SocketPool.__module__ = ( # pylint: disable=no-member + "adafruit_wiznet5k.adafruit_wiznet5k_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 +) diff --git a/tests/get_radio_test.py b/tests/get_radio_test.py index ea80f7e..b4ed1bb 100644 --- a/tests/get_radio_test.py +++ b/tests/get_radio_test.py @@ -27,7 +27,7 @@ def test_get_radio_socketpool_esp32spi(): def test_get_radio_socketpool_wiznet5k(): radio = mocket.MockRadio.WIZNET5K() socket_pool = adafruit_connection_manager.get_radio_socketpool(radio) - assert socket_pool.__name__ == "adafruit_wiznet5k_socket" + assert socket_pool.__module__ == "adafruit_wiznet5k.adafruit_wiznet5k_socketpool" def test_get_radio_socketpool_unsupported():