From 2861bbb02c1c06b80473176edb7f6e85a5473806 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 26 Nov 2015 13:08:13 -0800
Subject: [PATCH] Warn if config invalid shape for script

---
 homeassistant/components/script.py |  5 +++--
 tests/components/test_script.py    | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/homeassistant/components/script.py b/homeassistant/components/script.py
index 2b18a5143fd..f8240bbf7f5 100644
--- a/homeassistant/components/script.py
+++ b/homeassistant/components/script.py
@@ -76,8 +76,9 @@ def setup(hass, config):
             _LOGGER.warn("Found invalid key for script: %s. Use %s instead.",
                          object_id, slugify(object_id))
             continue
-        if not cfg.get(CONF_SEQUENCE):
-            _LOGGER.warn("Missing key 'sequence' for script %s", object_id)
+        if not isinstance(cfg.get(CONF_SEQUENCE), list):
+            _LOGGER.warn("Key 'sequence' for script %s should be a list",
+                         object_id)
             continue
         alias = cfg.get(CONF_ALIAS, object_id)
         script = Script(hass, object_id, alias, cfg[CONF_SEQUENCE])
diff --git a/tests/components/test_script.py b/tests/components/test_script.py
index 50cfba55ec5..30b7e4e3c8f 100644
--- a/tests/components/test_script.py
+++ b/tests/components/test_script.py
@@ -27,23 +27,10 @@ class TestScript(unittest.TestCase):
         """ Stop down stuff we started. """
         self.hass.stop()
 
-    def test_setup_with_empty_sequence(self):
-        self.assertTrue(script.setup(self.hass, {
-            'script': {
-                'test': {
-                    'sequence': []
-                }
-            }
-        }))
-
-        self.assertIsNone(self.hass.states.get(ENTITY_ID))
-
     def test_setup_with_missing_sequence(self):
         self.assertTrue(script.setup(self.hass, {
             'script': {
-                'test': {
-                    'sequence': []
-                }
+                'test': {}
             }
         }))
 
@@ -60,6 +47,19 @@ class TestScript(unittest.TestCase):
 
         self.assertEqual(0, len(self.hass.states.entity_ids('script')))
 
+    def test_setup_with_dict_as_sequence(self):
+        self.assertTrue(script.setup(self.hass, {
+            'script': {
+                'test': {
+                    'sequence': {
+                        'event': 'test_event'
+                    }
+                }
+            }
+        }))
+
+        self.assertEqual(0, len(self.hass.states.entity_ids('script')))
+
     def test_firing_event(self):
         event = 'test_event'
         calls = []