From 26a79dff99942e3090b0185dbe7973bcd6af869a Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 15 Feb 2019 10:51:52 +0100
Subject: [PATCH] Fix tests

---
 tests/test_setup.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/test_setup.py b/tests/test_setup.py
index 8575b023d37..1a60943a72d 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -90,7 +90,7 @@ class TestSetup:
                 }
             })
 
-    def test_validate_platform_config(self):
+    def test_validate_platform_config(self, caplog):
         """Test validating platform configuration."""
         platform_schema = PLATFORM_SCHEMA.extend({
             'hello': str,
@@ -109,7 +109,7 @@ class TestSetup:
             MockPlatform('whatever',
                          platform_schema=platform_schema))
 
-        with assert_setup_component(0):
+        with assert_setup_component(1):
             assert setup.setup_component(self.hass, 'platform_conf', {
                 'platform_conf': {
                     'platform': 'whatever',
@@ -117,11 +117,12 @@ class TestSetup:
                     'invalid': 'extra',
                 }
             })
+            assert caplog.text.count('Your configuration contains extra keys') == 1
 
         self.hass.data.pop(setup.DATA_SETUP)
         self.hass.config.components.remove('platform_conf')
 
-        with assert_setup_component(1):
+        with assert_setup_component(2):
             assert setup.setup_component(self.hass, 'platform_conf', {
                 'platform_conf': {
                     'platform': 'whatever',
@@ -132,6 +133,7 @@ class TestSetup:
                     'invalid': True
                 }
             })
+            assert caplog.text.count('Your configuration contains extra keys') == 2
 
         self.hass.data.pop(setup.DATA_SETUP)
         self.hass.config.components.remove('platform_conf')
@@ -183,7 +185,7 @@ class TestSetup:
             assert 'platform_conf' in self.hass.config.components
             assert not config['platform_conf']  # empty
 
-    def test_validate_platform_config_2(self):
+    def test_validate_platform_config_2(self, caplog):
         """Test component PLATFORM_SCHEMA_BASE prio over PLATFORM_SCHEMA."""
         platform_schema = PLATFORM_SCHEMA.extend({
             'hello': str,
@@ -204,7 +206,7 @@ class TestSetup:
             MockPlatform('whatever',
                          platform_schema=platform_schema))
 
-        with assert_setup_component(0):
+        with assert_setup_component(1):
             assert setup.setup_component(self.hass, 'platform_conf', {
                 # fail: no extra keys allowed in platform schema
                 'platform_conf': {
@@ -213,6 +215,7 @@ class TestSetup:
                     'invalid': 'extra',
                 }
             })
+            assert caplog.text.count('Your configuration contains extra keys') == 1
 
         self.hass.data.pop(setup.DATA_SETUP)
         self.hass.config.components.remove('platform_conf')
@@ -234,7 +237,7 @@ class TestSetup:
         self.hass.data.pop(setup.DATA_SETUP)
         self.hass.config.components.remove('platform_conf')
 
-    def test_validate_platform_config_3(self):
+    def test_validate_platform_config_3(self, caplog):
         """Test fallback to component PLATFORM_SCHEMA."""
         component_schema = PLATFORM_SCHEMA_BASE.extend({
             'hello': str,
@@ -255,15 +258,15 @@ class TestSetup:
             MockPlatform('whatever',
                          platform_schema=platform_schema))
 
-        with assert_setup_component(0):
+        with assert_setup_component(1):
             assert setup.setup_component(self.hass, 'platform_conf', {
                 'platform_conf': {
-                    # fail: no extra keys allowed
                     'platform': 'whatever',
                     'hello': 'world',
                     'invalid': 'extra',
                 }
             })
+            assert caplog.text.count('Your configuration contains extra keys') == 1
 
         self.hass.data.pop(setup.DATA_SETUP)
         self.hass.config.components.remove('platform_conf')