From 631a819bd13a5177f03d4c1ae05548961a9968c4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 31 Oct 2019 11:39:26 -0700
Subject: [PATCH] Fix check config (#28393)

---
 homeassistant/requirements.py | 12 ++++++++++--
 tests/test_requirements.py    | 21 ++++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/homeassistant/requirements.py b/homeassistant/requirements.py
index 95738084f1f..74469ef2fcd 100644
--- a/homeassistant/requirements.py
+++ b/homeassistant/requirements.py
@@ -35,13 +35,21 @@ async def async_get_integration_with_requirements(
     This can raise IntegrationNotFound if manifest or integration
     is invalid, RequirementNotFound if there was some type of
     failure to install requirements.
+
+    Does not handle circular dependencies.
     """
     integration = await async_get_integration(hass, domain)
 
-    if hass.config.skip_pip or not integration.requirements:
+    if hass.config.skip_pip:
         return integration
 
-    await async_process_requirements(hass, integration.domain, integration.requirements)
+    if integration.requirements:
+        await async_process_requirements(
+            hass, integration.domain, integration.requirements
+        )
+
+    for dependency in integration.dependencies:
+        await async_get_integration_with_requirements(hass, dependency)
 
     return integration
 
diff --git a/tests/test_requirements.py b/tests/test_requirements.py
index 780b175778e..548ea645360 100644
--- a/tests/test_requirements.py
+++ b/tests/test_requirements.py
@@ -112,7 +112,17 @@ async def test_install_missing_package(hass):
 async def test_get_integration_with_requirements(hass):
     """Check getting an integration with loaded requirements."""
     hass.config.skip_pip = False
-    mock_integration(hass, MockModule("test_component", requirements=["hello==1.0.0"]))
+    mock_integration(
+        hass, MockModule("test_component_dep", requirements=["test-comp-dep==1.0.0"])
+    )
+    mock_integration(
+        hass,
+        MockModule(
+            "test_component",
+            requirements=["test-comp==1.0.0"],
+            dependencies=["test_component_dep"],
+        ),
+    )
 
     with patch(
         "homeassistant.util.package.is_installed", return_value=False
@@ -126,8 +136,13 @@ async def test_get_integration_with_requirements(hass):
         assert integration
         assert integration.domain == "test_component"
 
-    assert len(mock_is_installed.mock_calls) == 1
-    assert len(mock_inst.mock_calls) == 1
+    assert len(mock_is_installed.mock_calls) == 2
+    assert mock_is_installed.mock_calls[0][1][0] == "test-comp==1.0.0"
+    assert mock_is_installed.mock_calls[1][1][0] == "test-comp-dep==1.0.0"
+
+    assert len(mock_inst.mock_calls) == 2
+    assert mock_inst.mock_calls[0][1][0] == "test-comp==1.0.0"
+    assert mock_inst.mock_calls[1][1][0] == "test-comp-dep==1.0.0"
 
 
 async def test_install_with_wheels_index(hass):