From 1a478bd78ab832fa7c7435bae91e5356536e3368 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:55:29 +0200
Subject: [PATCH] Use root import for media_player and media_source in tests
 (#125829)

---
 tests/components/dlna_dms/test_device_availability.py | 4 ++--
 tests/components/dlna_dms/test_dms_device_source.py   | 5 ++---
 tests/components/jellyfin/test_media_source.py        | 2 +-
 tests/components/nest/test_media_source.py            | 2 +-
 tests/components/reolink/test_media_source.py         | 2 +-
 tests/components/system_bridge/test_media_source.py   | 2 +-
 tests/components/tts/test_media_source.py             | 2 +-
 tests/components/universal/test_media_player.py       | 7 +++++--
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/components/dlna_dms/test_device_availability.py b/tests/components/dlna_dms/test_device_availability.py
index c1ad3c91a7b..1be68f91733 100644
--- a/tests/components/dlna_dms/test_device_availability.py
+++ b/tests/components/dlna_dms/test_device_availability.py
@@ -15,8 +15,8 @@ import pytest
 from homeassistant.components import media_source, ssdp
 from homeassistant.components.dlna_dms.const import DOMAIN
 from homeassistant.components.dlna_dms.dms import get_domain_data
-from homeassistant.components.media_player.errors import BrowseError
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_player import BrowseError
+from homeassistant.components.media_source import Unresolvable
 from homeassistant.core import HomeAssistant
 
 from .conftest import (
diff --git a/tests/components/dlna_dms/test_dms_device_source.py b/tests/components/dlna_dms/test_dms_device_source.py
index 23d9e6927ae..7907d40c415 100644
--- a/tests/components/dlna_dms/test_dms_device_source.py
+++ b/tests/components/dlna_dms/test_dms_device_source.py
@@ -13,9 +13,8 @@ import pytest
 from homeassistant.components import media_source, ssdp
 from homeassistant.components.dlna_dms.const import DLNA_SORT_CRITERIA, DOMAIN
 from homeassistant.components.dlna_dms.dms import DidlPlayMedia
-from homeassistant.components.media_player.errors import BrowseError
-from homeassistant.components.media_source.error import Unresolvable
-from homeassistant.components.media_source.models import BrowseMediaSource
+from homeassistant.components.media_player import BrowseError
+from homeassistant.components.media_source import BrowseMediaSource, Unresolvable
 from homeassistant.core import HomeAssistant
 
 from .conftest import (
diff --git a/tests/components/jellyfin/test_media_source.py b/tests/components/jellyfin/test_media_source.py
index a57d51de1f1..2aca59a4d26 100644
--- a/tests/components/jellyfin/test_media_source.py
+++ b/tests/components/jellyfin/test_media_source.py
@@ -6,7 +6,7 @@ import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.jellyfin.const import DOMAIN
-from homeassistant.components.media_player.errors import BrowseError
+from homeassistant.components.media_player import BrowseError
 from homeassistant.components.media_source import (
     DOMAIN as MEDIA_SOURCE_DOMAIN,
     URI_SCHEME,
diff --git a/tests/components/nest/test_media_source.py b/tests/components/nest/test_media_source.py
index 4bc3559e308..101bfae089d 100644
--- a/tests/components/nest/test_media_source.py
+++ b/tests/components/nest/test_media_source.py
@@ -17,7 +17,7 @@ from google_nest_sdm.event import EventMessage
 import numpy as np
 import pytest
 
-from homeassistant.components.media_player.errors import BrowseError
+from homeassistant.components.media_player import BrowseError
 from homeassistant.components.media_source import (
     URI_SCHEME,
     Unresolvable,
diff --git a/tests/components/reolink/test_media_source.py b/tests/components/reolink/test_media_source.py
index 6351f683545..494432d0412 100644
--- a/tests/components/reolink/test_media_source.py
+++ b/tests/components/reolink/test_media_source.py
@@ -10,10 +10,10 @@ from reolink_aio.exceptions import ReolinkError
 from homeassistant.components.media_source import (
     DOMAIN as MEDIA_SOURCE_DOMAIN,
     URI_SCHEME,
+    Unresolvable,
     async_browse_media,
     async_resolve_media,
 )
-from homeassistant.components.media_source.error import Unresolvable
 from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL
 from homeassistant.components.reolink.const import CONF_USE_HTTPS, DOMAIN
 from homeassistant.components.stream import DOMAIN as MEDIA_STREAM_DOMAIN
diff --git a/tests/components/system_bridge/test_media_source.py b/tests/components/system_bridge/test_media_source.py
index 161d69569b6..58ee4ebe05c 100644
--- a/tests/components/system_bridge/test_media_source.py
+++ b/tests/components/system_bridge/test_media_source.py
@@ -4,7 +4,7 @@ import pytest
 from syrupy.assertion import SnapshotAssertion
 from syrupy.filters import paths
 
-from homeassistant.components.media_player.errors import BrowseError
+from homeassistant.components.media_player import BrowseError
 from homeassistant.components.media_source import (
     DOMAIN as MEDIA_SOURCE_DOMAIN,
     URI_SCHEME,
diff --git a/tests/components/tts/test_media_source.py b/tests/components/tts/test_media_source.py
index ba856fd9622..81bbfcfed8a 100644
--- a/tests/components/tts/test_media_source.py
+++ b/tests/components/tts/test_media_source.py
@@ -6,7 +6,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from homeassistant.components import media_source
-from homeassistant.components.media_player.errors import BrowseError
+from homeassistant.components.media_player import BrowseError
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py
index 7c992814cfe..5ebfd2c13ad 100644
--- a/tests/components/universal/test_media_player.py
+++ b/tests/components/universal/test_media_player.py
@@ -8,8 +8,11 @@ from voluptuous.error import MultipleInvalid
 
 from homeassistant import config as hass_config
 from homeassistant.components import input_number, input_select, media_player, switch
-from homeassistant.components.media_player import MediaClass, MediaPlayerEntityFeature
-from homeassistant.components.media_player.browse_media import BrowseMedia
+from homeassistant.components.media_player import (
+    BrowseMedia,
+    MediaClass,
+    MediaPlayerEntityFeature,
+)
 import homeassistant.components.universal.media_player as universal
 from homeassistant.const import (
     SERVICE_RELOAD,