Move mocked soco fixture to conftest (#904)

SoCo · Mar 2, 2022 · ef70f01 · ef70f01
1 parent 1dc6281
commit ef70f01
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 64 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -3,16 +3,45 @@
 Add the --ip command line option, and skip all tests marked the with
 'integration' marker unless the option is included
 """
-from os import path
-import json
 import codecs
-
+import json
+from os import path
+from unittest import mock
 
 import pytest
+from soco import SoCo
 
+IP_ADDR = "192.168.1.101"
 THISDIR = path.dirname(path.abspath(__file__))
 
 
+@pytest.fixture()
+def moco():
+    """A mock soco with fake services and hardcoded is_coordinator.
+
+    Allows calls to services to be tracked. Should not cause any network
+    access
+    """
+    services = (
+        "AVTransport",
+        "RenderingControl",
+        "DeviceProperties",
+        "ContentDirectory",
+        "ZoneGroupTopology",
+        "GroupRenderingControl",
+    )
+    patchers = [mock.patch("soco.core.{}".format(service)) for service in services]
+    for patch in patchers:
+        patch.start()
+    with mock.patch(
+        "soco.SoCo.is_coordinator", new_callable=mock.PropertyMock
+    ) as is_coord:
+        is_coord = True  # noqa: F841
+        yield SoCo(IP_ADDR)
+    for patch in reversed(patchers):
+        patch.stop()
+
+
 def pytest_addoption(parser):
     """Add the --ip commandline option"""
     parser.addoption(

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -2,6 +2,7 @@
 import pytest
 import requests_mock
 
+from conftest import IP_ADDR
 from soco import SoCo
 from soco.data_structures import to_didl_string
 from soco.exceptions import (
@@ -13,35 +14,6 @@
 from soco.groups import ZoneGroup
 from soco.xml import XML
 
-IP_ADDR = "192.168.1.101"
-
-
-@pytest.fixture()
-def moco():
-    """A mock soco with fake services and hardcoded is_coordinator.
-
-    Allows calls to services to be tracked. Should not cause any network
-    access
-    """
-    services = (
-        "AVTransport",
-        "RenderingControl",
-        "DeviceProperties",
-        "ContentDirectory",
-        "ZoneGroupTopology",
-        "GroupRenderingControl",
-    )
-    patchers = [mock.patch("soco.core.{}".format(service)) for service in services]
-    for patch in patchers:
-        patch.start()
-    with mock.patch(
-        "soco.SoCo.is_coordinator", new_callable=mock.PropertyMock
-    ) as is_coord:
-        is_coord = True  # noqa: F841
-        yield SoCo(IP_ADDR)
-    for patch in reversed(patchers):
-        patch.stop()
-
 
 @pytest.fixture()
 def moco_only_on_master():

diff --git a/tests/test_music_library.py b/tests/test_music_library.py
@@ -1,37 +1,5 @@
-from unittest import mock
-import pytest
-
-from soco import SoCo
 from soco.exceptions import SoCoUPnPException
 
-IP_ADDR = "192.168.1.101"
-
-
-@pytest.fixture()
-def moco():
-    """A mock soco with fake services and hardcoded is_coordinator.
-
-    Allows calls to services to be tracked. Should not cause any network
-    access
-    """
-    services = (
-        "AVTransport",
-        "RenderingControl",
-        "DeviceProperties",
-        "ContentDirectory",
-        "ZoneGroupTopology",
-    )
-    patchers = [mock.patch("soco.core.{}".format(service)) for service in services]
-    for patch in patchers:
-        patch.start()
-    with mock.patch(
-        "soco.SoCo.is_coordinator", new_callable=mock.PropertyMock
-    ) as is_coord:
-        is_coord = True  # noqa: F841
-        yield SoCo(IP_ADDR)
-    for patch in reversed(patchers):
-        patch.stop()
-
 
 class TestMusicLibrary:
     def test_search_track_no_result(self, moco):