From 0cf922cc4e558d88b8093d417774d1fdf7993b4a Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Wed, 29 Jun 2022 23:54:51 -0700
Subject: [PATCH] Allow legacy nest integration with no configuration.yaml
 (#74222)

---
 homeassistant/components/nest/__init__.py |  2 +-
 tests/components/nest/common.py           | 12 +++++++++++-
 tests/components/nest/test_init_legacy.py |  5 ++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/nest/__init__.py b/homeassistant/components/nest/__init__.py
index 0e0128136ad..b31354b598c 100644
--- a/homeassistant/components/nest/__init__.py
+++ b/homeassistant/components/nest/__init__.py
@@ -177,7 +177,7 @@ class SignalUpdateCallback:
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Nest from a config entry with dispatch between old/new flows."""
     config_mode = config_flow.get_config_mode(hass)
-    if config_mode == config_flow.ConfigMode.LEGACY:
+    if DATA_SDM not in entry.data or config_mode == config_flow.ConfigMode.LEGACY:
         return await async_setup_legacy_entry(hass, entry)
 
     if config_mode == config_flow.ConfigMode.SDM:
diff --git a/tests/components/nest/common.py b/tests/components/nest/common.py
index 765a954b6de..f86112ada75 100644
--- a/tests/components/nest/common.py
+++ b/tests/components/nest/common.py
@@ -147,7 +147,17 @@ TEST_CONFIG_LEGACY = NestTestConfig(
             },
         },
     },
-    credential=None,
+)
+TEST_CONFIG_ENTRY_LEGACY = NestTestConfig(
+    config_entry_data={
+        "auth_implementation": "local",
+        "tokens": {
+            "expires_at": time.time() + 86400,
+            "access_token": {
+                "token": "some-token",
+            },
+        },
+    },
 )
 
 
diff --git a/tests/components/nest/test_init_legacy.py b/tests/components/nest/test_init_legacy.py
index cbf1bfe2d48..fc4e6070faf 100644
--- a/tests/components/nest/test_init_legacy.py
+++ b/tests/components/nest/test_init_legacy.py
@@ -4,7 +4,7 @@ from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
 
-from .common import TEST_CONFIG_LEGACY
+from .common import TEST_CONFIG_ENTRY_LEGACY, TEST_CONFIG_LEGACY
 
 DOMAIN = "nest"
 
@@ -33,6 +33,9 @@ def make_thermostat():
     return device
 
 
+@pytest.mark.parametrize(
+    "nest_test_config", [TEST_CONFIG_LEGACY, TEST_CONFIG_ENTRY_LEGACY]
+)
 async def test_thermostat(hass, setup_base_platform):
     """Test simple initialization for thermostat entities."""