Remove unnecessary imports of http integration (#141899)

* Remove unnecessary imports of http integration

* Check reason for test failures

* Revert "Check reason for test failures"

This reverts commit 5ccf356ab029402ab87e00dc00eeb4798a0f6658.

* Update tests

homeassistant/components/plex/config_flow.py

@@ -14,7 +14,6 @@ from plexauth import PlexAuth
 import requests.exceptions
 import voluptuous as vol
 
-from homeassistant.components import http
 from homeassistant.components.http import KEY_HASS, HomeAssistantView
 from homeassistant.components.media_player import DOMAIN as MP_DOMAIN
 from homeassistant.config_entries import (
@@ -36,7 +35,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, discovery_flow
+from homeassistant.helpers import config_validation as cv, discovery_flow, http
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (

homeassistant/helpers/config_entry_oauth2_flow.py

@@ -27,11 +27,11 @@ import voluptuous as vol
 from yarl import URL
 
 from homeassistant import config_entries
-from homeassistant.components import http
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.loader import async_get_application_credentials
 from homeassistant.util.hass_dict import HassKey
 
+from . import http
 from .aiohttp_client import async_get_clientsession
 from .network import NoURLAvailableError
 

homeassistant/helpers/network.py

@@ -10,12 +10,12 @@ from aiohttp import hdrs
 from hass_nabucasa import remote
 import yarl
 
-from homeassistant.components import http
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import bind_hass
 from homeassistant.util.network import is_ip_address, is_loopback, normalize_url
 
+from . import http
 from .hassio import is_hassio
 
 TYPE_URL_INTERNAL = "internal_url"

tests/components/http/test_auth.py

@@ -18,7 +18,6 @@ from homeassistant.auth.models import User
 from homeassistant.auth.providers import trusted_networks
 from homeassistant.auth.providers.homeassistant import HassAuthProvider
 from homeassistant.components import websocket_api
-from homeassistant.components.http import KEY_HASS
 from homeassistant.components.http.auth import (
     CONTENT_USER_NAME,
     DATA_SIGN_SECRET,
@@ -28,13 +27,13 @@ from homeassistant.components.http.auth import (
     async_sign_path,
     async_user_not_allowed_do_auth,
 )
-from homeassistant.components.http.const import KEY_AUTHENTICATED
 from homeassistant.components.http.forwarded import async_setup_forwarded
 from homeassistant.components.http.request_context import (
     current_request,
     setup_request_context,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.http import KEY_AUTHENTICATED, KEY_HASS
 from homeassistant.setup import async_setup_component
 
 from . import HTTP_HEADER_HA_AUTH

tests/components/http/test_ban.py

@@ -11,7 +11,6 @@ from aiohttp.web_middlewares import middleware
 import pytest
 
 from homeassistant.components import http
-from homeassistant.components.http import KEY_AUTHENTICATED, KEY_HASS
 from homeassistant.components.http.ban import (
     IP_BANS_FILE,
     KEY_BAN_MANAGER,
@@ -22,6 +21,7 @@ from homeassistant.components.http.ban import (
 from homeassistant.components.http.view import request_handler_factory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.http import KEY_AUTHENTICATED, KEY_HASS
 from homeassistant.setup import async_setup_component
 
 from tests.common import async_get_persistent_notifications

tests/components/http/test_cors.py

@@ -18,9 +18,8 @@ from aiohttp.test_utils import TestClient
 import pytest
 
 from homeassistant.components.http.cors import setup_cors
-from homeassistant.components.http.view import HomeAssistantView
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.http import KEY_ALLOW_CONFIGURED_CORS
+from homeassistant.helpers.http import KEY_ALLOW_CONFIGURED_CORS, HomeAssistantView
 from homeassistant.setup import async_setup_component
 
 from . import HTTP_HEADER_HA_AUTH

tests/components/plex/test_config_flow.py

@@ -856,7 +856,7 @@ async def test_client_header_issues(hass: HomeAssistant) -> None:
         patch("plexauth.PlexAuth.initiate_auth"),
         patch("plexauth.PlexAuth.token", return_value=None),
         patch(
-            "homeassistant.components.http.current_request.get",
+            "homeassistant.helpers.http.current_request.get",
             return_value=MockRequest(),
         ),
         pytest.raises(

tests/conftest.py

@@ -852,7 +852,7 @@ def hass_client_no_auth(
 @pytest.fixture
 def current_request() -> Generator[MagicMock]:
     """Mock current request."""
-    with patch("homeassistant.components.http.current_request") as mock_request_context:
+    with patch("homeassistant.helpers.http.current_request") as mock_request_context:
         mocked_request = make_mocked_request(
             "GET",
             "/some/request",

tests/helpers/test_network.py

@@ -538,7 +538,7 @@ async def test_get_url(hass: HomeAssistant) -> None:
             "homeassistant.helpers.network._get_request_host",
             return_value="example.com",
         ),
-        patch("homeassistant.components.http.current_request"),
+        patch("homeassistant.helpers.http.current_request"),
     ):
         assert get_url(hass, require_current_request=True) == "https://example.com"
         assert (
@@ -554,7 +554,7 @@ async def test_get_url(hass: HomeAssistant) -> None:
             "homeassistant.helpers.network._get_request_host",
             return_value="example.local",
         ),
-        patch("homeassistant.components.http.current_request"),
+        patch("homeassistant.helpers.http.current_request"),
     ):
         assert get_url(hass, require_current_request=True) == "http://example.local"
 
@@ -592,7 +592,7 @@ async def test_get_request_host_with_port(hass: HomeAssistant) -> None:
     with pytest.raises(NoURLAvailableError):
         _get_request_host()
 
-    with patch("homeassistant.components.http.current_request") as mock_request_context:
+    with patch("homeassistant.helpers.http.current_request") as mock_request_context:
         mock_request = Mock()
         mock_request.headers = CIMultiDictProxy(
             CIMultiDict({hdrs.HOST: "example.com:8123"})
@@ -609,7 +609,7 @@ async def test_get_request_host_without_port(hass: HomeAssistant) -> None:
     with pytest.raises(NoURLAvailableError):
         _get_request_host()
 
-    with patch("homeassistant.components.http.current_request") as mock_request_context:
+    with patch("homeassistant.helpers.http.current_request") as mock_request_context:
         mock_request = Mock()
         mock_request.headers = CIMultiDictProxy(CIMultiDict({hdrs.HOST: "example.com"}))
         mock_request.url = URL("http://example.com/test/request")
@@ -624,7 +624,7 @@ async def test_get_request_ipv6_address(hass: HomeAssistant) -> None:
     with pytest.raises(NoURLAvailableError):
         _get_request_host()
 
-    with patch("homeassistant.components.http.current_request") as mock_request_context:
+    with patch("homeassistant.helpers.http.current_request") as mock_request_context:
         mock_request = Mock()
         mock_request.headers = CIMultiDictProxy(CIMultiDict({hdrs.HOST: "[::1]:8123"}))
         mock_request.url = URL("http://[::1]:8123/test/request")
@@ -639,7 +639,7 @@ async def test_get_request_ipv6_address_without_port(hass: HomeAssistant) -> Non
     with pytest.raises(NoURLAvailableError):
         _get_request_host()
 
-    with patch("homeassistant.components.http.current_request") as mock_request_context:
+    with patch("homeassistant.helpers.http.current_request") as mock_request_context:
         mock_request = Mock()
         mock_request.headers = CIMultiDictProxy(CIMultiDict({hdrs.HOST: "[::1]"}))
         mock_request.url = URL("http://[::1]/test/request")
@@ -654,7 +654,7 @@ async def test_get_request_host_no_host_header(hass: HomeAssistant) -> None:
     with pytest.raises(NoURLAvailableError):
         _get_request_host()
 
-    with patch("homeassistant.components.http.current_request") as mock_request_context:
+    with patch("homeassistant.helpers.http.current_request") as mock_request_context:
         mock_request = Mock()
         mock_request.headers = CIMultiDictProxy(CIMultiDict())
         mock_request.url = URL("/test/request")

tests/test_test_fixtures.py

@@ -9,9 +9,9 @@ from aiohttp import web
 import pytest
 import pytest_socket
 
-from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import HomeAssistant, async_get_hass
 from homeassistant.helpers import translation
+from homeassistant.helpers.http import HomeAssistantView
 from homeassistant.setup import async_setup_component
 
 from .common import MockModule, mock_integration