From 1e685a4a0087ed2acc31b7c13ad627493a7e9000 Mon Sep 17 00:00:00 2001
From: Chris Talkington <chris@talkingtontech.com>
Date: Sun, 2 Aug 2020 18:02:47 -0500
Subject: [PATCH] Optimize ipp tests (#38485)

* optimize ipp tests

* Update test_config_flow.py
---
 tests/components/ipp/__init__.py         | 17 +++++++++--------
 tests/components/ipp/test_config_flow.py |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/components/ipp/__init__.py b/tests/components/ipp/__init__.py
index 515543f3cf5..1e269438ad5 100644
--- a/tests/components/ipp/__init__.py
+++ b/tests/components/ipp/__init__.py
@@ -143,15 +143,16 @@ async def init_integration(
 
     entry.add_to_hass(hass)
 
+    mock_connection(
+        aioclient_mock,
+        host=host,
+        port=port,
+        ssl=ssl,
+        base_path=base_path,
+        conn_error=conn_error,
+    )
+
     if not skip_setup:
-        mock_connection(
-            aioclient_mock,
-            host=host,
-            port=port,
-            ssl=ssl,
-            base_path=base_path,
-            conn_error=conn_error,
-        )
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
diff --git a/tests/components/ipp/test_config_flow.py b/tests/components/ipp/test_config_flow.py
index b9a1d833eda..7133bf3cde7 100644
--- a/tests/components/ipp/test_config_flow.py
+++ b/tests/components/ipp/test_config_flow.py
@@ -218,7 +218,7 @@ async def test_user_device_exists_abort(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test we abort user flow if printer already configured."""
-    await init_integration(hass, aioclient_mock)
+    await init_integration(hass, aioclient_mock, skip_setup=True)
 
     user_input = MOCK_USER_INPUT.copy()
     result = await hass.config_entries.flow.async_init(
@@ -233,7 +233,7 @@ async def test_zeroconf_device_exists_abort(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test we abort zeroconf flow if printer already configured."""
-    await init_integration(hass, aioclient_mock)
+    await init_integration(hass, aioclient_mock, skip_setup=True)
 
     discovery_info = MOCK_ZEROCONF_IPP_SERVICE_INFO.copy()
     result = await hass.config_entries.flow.async_init(
@@ -248,7 +248,7 @@ async def test_zeroconf_with_uuid_device_exists_abort(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test we abort zeroconf flow if printer already configured."""
-    await init_integration(hass, aioclient_mock)
+    await init_integration(hass, aioclient_mock, skip_setup=True)
 
     discovery_info = {
         **MOCK_ZEROCONF_IPP_SERVICE_INFO,