Template switch change flow / add restore (#6356)

* Template switch change flow / add restore

* fix tests

* fix binary_sensor template

tests/components/switch/test_template.py

@@ -1,12 +1,14 @@
 """The tests for the  Template switch platform."""
-from homeassistant.core import callback
+import asyncio
+
+from homeassistant.core import callback, State, CoreState
 import homeassistant.bootstrap as bootstrap
 import homeassistant.components as core
-from homeassistant.const import (
-    STATE_ON,
-    STATE_OFF)
+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.helpers.restore_state import DATA_RESTORE_CACHE
 
-from tests.common import get_test_home_assistant, assert_setup_component
+from tests.common import (
+    get_test_home_assistant, assert_setup_component, mock_component)
 
 
 class TestTemplateSwitch:
@@ -55,6 +57,9 @@ class TestTemplateSwitch:
                 }
             })
 
+        self.hass.start()
+        self.hass.block_till_done()
+
         state = self.hass.states.set('switch.test_state', STATE_ON)
         self.hass.block_till_done()
 
@@ -90,6 +95,9 @@ class TestTemplateSwitch:
                 }
             })
 
+        self.hass.start()
+        self.hass.block_till_done()
+
         state = self.hass.states.get('switch.test_template_switch')
         assert state.state == STATE_ON
 
@@ -116,6 +124,9 @@ class TestTemplateSwitch:
                 }
             })
 
+        self.hass.start()
+        self.hass.block_till_done()
+
         state = self.hass.states.get('switch.test_template_switch')
         assert state.state == STATE_OFF
 
@@ -141,6 +152,10 @@ class TestTemplateSwitch:
                     }
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_invalid_name_does_not_create(self):
@@ -165,6 +180,10 @@ class TestTemplateSwitch:
                     }
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_invalid_switch_does_not_create(self):
@@ -178,6 +197,10 @@ class TestTemplateSwitch:
                     }
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_no_switches_does_not_create(self):
@@ -188,6 +211,10 @@ class TestTemplateSwitch:
                     'platform': 'template'
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_missing_template_does_not_create(self):
@@ -212,6 +239,10 @@ class TestTemplateSwitch:
                     }
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_missing_on_does_not_create(self):
@@ -236,6 +267,10 @@ class TestTemplateSwitch:
                     }
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_missing_off_does_not_create(self):
@@ -260,6 +295,10 @@ class TestTemplateSwitch:
                     }
                 }
             })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         assert self.hass.states.all() == []
 
     def test_on_action(self):
@@ -282,6 +321,10 @@ class TestTemplateSwitch:
                 }
             }
         })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         self.hass.states.set('switch.test_state', STATE_OFF)
         self.hass.block_till_done()
 
@@ -314,6 +357,10 @@ class TestTemplateSwitch:
                 }
             }
         })
+
+        self.hass.start()
+        self.hass.block_till_done()
+
         self.hass.states.set('switch.test_state', STATE_ON)
         self.hass.block_till_done()
 
@@ -324,3 +371,44 @@ class TestTemplateSwitch:
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
+
+
+@asyncio.coroutine
+def test_restore_state(hass):
+    """Ensure states are restored on startup."""
+    hass.data[DATA_RESTORE_CACHE] = {
+        'switch.test_template_switch':
+            State('switch.test_template_switch', 'on'),
+    }
+
+    hass.state = CoreState.starting
+    mock_component(hass, 'recorder')
+
+    yield from bootstrap.async_setup_component(hass, 'switch', {
+        'switch': {
+            'platform': 'template',
+            'switches': {
+                'test_template_switch': {
+                    'value_template':
+                        "{{ states.switch.test_state.state }}",
+                    'turn_on': {
+                        'service': 'switch.turn_on',
+                        'entity_id': 'switch.test_state'
+                    },
+                    'turn_off': {
+                        'service': 'switch.turn_off',
+                        'entity_id': 'switch.test_state'
+                    },
+                }
+            }
+        }
+    })
+
+    state = hass.states.get('switch.test_template_switch')
+    assert state.state == 'on'
+
+    yield from hass.async_start()
+    yield from hass.async_block_till_done()
+
+    state = hass.states.get('switch.test_template_switch')
+    assert state.state == 'unavailable'