python-zeroconf · bdraco · Jun 13, 2021 · Jun 13, 2021
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -19,3 +19,11 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
     USA
 """
+
+from zeroconf.core import Zeroconf
+from zeroconf.dns import DNSIncoming
+
+
+def _inject_response(zc: Zeroconf, msg: DNSIncoming) -> None:
+    """Inject a DNSIncoming response."""
+    zc.handle_response(msg)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+
+""" conftest for zeroconf tests. """
+
+import threading
+
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def verify_threads_ended():
+    """Verify that the threads are not running after the test."""
+    threads_before = frozenset(threading.enumerate())
+    yield
+    threads = frozenset(threading.enumerate()) - threads_before
+    assert not threads
diff --git a/tests/test_aio.py b/tests/test_aio.py
@@ -6,6 +6,7 @@
 
 import asyncio
 import socket
+import threading
 import unittest.mock
 
 import pytest
@@ -23,6 +24,23 @@
 from zeroconf.aio import AsyncServiceInfo, AsyncServiceListener, AsyncZeroconf
 
 
+@pytest.fixture(autouse=True)
+def verify_threads_ended():
+    """Verify that the threads are not running after the test."""
+    threads_before = frozenset(threading.enumerate())
+    yield
+    threads_after = frozenset(threading.enumerate())
+    non_executor_threads = frozenset(
+        [
+            thread
+            for thread in threads_after
+            if "asyncio" not in thread.name and "ThreadPoolExecutor" not in thread.name
+        ]
+    )
+    threads = non_executor_threads - threads_before
+    assert not threads
+
+
 @pytest.mark.asyncio
 async def test_async_basic_usage() -> None:
     """Test we can create and close the instance."""

diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py
@@ -4,12 +4,29 @@
 
 """Unit tests for asyncio.py."""
 
-
 import pytest
+import threading
 
 from zeroconf.asyncio import AsyncZeroconf
 
 
+@pytest.fixture(autouse=True)
+def verify_threads_ended():
+    """Verify that the threads are not running after the test."""
+    threads_before = frozenset(threading.enumerate())
+    yield
+    threads_after = frozenset(threading.enumerate())
+    non_executor_threads = frozenset(
+        [
+            thread
+            for thread in threads_after
+            if "asyncio" not in thread.name and "ThreadPoolExecutor" not in thread.name
+        ]
+    )
+    threads = non_executor_threads - threads_before
+    assert not threads
+
+
 @pytest.mark.asyncio
 async def test_async_basic_usage() -> None:
     """Test we can create and close the instance."""

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -20,15 +20,6 @@
 original_logging_level = logging.NOTSET
 
 
-@pytest.fixture(autouse=True)
-def verify_threads_ended():
-    """Verify that the threads are not running after the test."""
-    threads_before = frozenset(threading.enumerate())
-    yield
-    threads = frozenset(threading.enumerate()) - threads_before
-    assert not threads
-
-
 def setup_module():
     global original_logging_level
     original_logging_level = log.level