Merge pull request #48155 from max-arnold/2018.3

Do not fail on empty saltclass classes (fix for #48145)

salt/utils/saltclass.py

@@ -172,7 +172,7 @@ def expand_classes_in_order(minion_dict,
             if expanded_classes[klass] is None:
                 expanded_classes[klass] = {}
             # Now replace class element in classes_to_expand by expansion
-            if 'classes' in expanded_classes[klass]:
+            if expanded_classes[klass].get('classes'):
                 l_id = classes_to_expand.index(klass)
                 classes_to_expand[l_id:l_id] = expanded_classes[klass]['classes']
                 expand_classes_in_order(minion_dict,

tests/integration/files/saltclass/examples/classes/default/empty.yml

@@ -0,0 +1,4 @@
+# https://github.com/saltstack/salt/issues/48145
+classes:
+states:
+pillars:

tests/integration/files/saltclass/examples/classes/default/init.yml

@@ -1,6 +1,7 @@
 classes:
   - default.users
   - default.motd
+  - default.empty
 
 states:
   - openssh

tests/unit/pillar/test_saltclass.py

@@ -48,5 +48,5 @@ class SaltclassPillarTestCase(TestCase, LoaderModuleMockMixin):
         self.assertListEqual(parsed_ret, expected_ret)
 
     def test_succeeds(self):
-        ret = ['default.users', 'default.motd', 'default', 'roles.app']
+        ret = ['default.users', 'default.motd', 'default.empty', 'default', 'roles.app']
         self._runner(ret)