Fixing status beacon tests.

saltstack · Apr 24, 2018 · a2a8d78 · a2a8d78
1 parent c87d6ca
commit a2a8d78
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/tests/unit/beacons/test_status_beacon.py b/tests/unit/beacons/test_status_beacon.py
@@ -44,7 +44,11 @@ def setup_loader_modules(self):
         }
 
     def test_empty_config(self, *args, **kwargs):
-        config = {}
+        config = []
+
+        ret = status.validate(config)
+        self.assertEqual(ret, (True, 'Valid beacon configuration'))
+
         ret = status.beacon(config)
 
         if sys.platform.startswith('win'):
@@ -56,21 +60,18 @@ def test_empty_config(self, *args, **kwargs):
 
     def test_deprecated_dict_config(self):
         config = {'time': ['all']}
-        ret = status.beacon(config)
-        self.assertEqual(ret, (True, 'Valid beacon configuration'))
 
-        if sys.platform.startswith('win'):
-            expected = []
-        else:
-            expected = ['time']
-
-        self.assertEqual(list(ret[0]['data']), expected)
+        ret = status.validate(config)
+        self.assertEqual(ret, (False, 'Configuration for status beacon must be a list.'))
 
     def test_list_config(self):
         config = [{'time': ['all']}]
-        ret = status.beacon(config)
+
+        ret = status.validate(config)
         self.assertEqual(ret, (True, 'Valid beacon configuration'))
 
+        ret = status.beacon(config)
+
         if sys.platform.startswith('win'):
             expected = []
         else: