Back-port #34324 to 2015.8 (#34344)

* Add test to match against custom grains

* Lint

* Forgot to add custom grain

tests/integration/files/file/base/_grains/matcher_grain.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+def myfunction():
+     grains = {}
+     grains['match'] = 'maker'
+     return grains

tests/integration/shell/matcher.py

@@ -150,6 +150,8 @@ def test_grain(self):
         '''
         test salt grain matcher
         '''
+        # Sync grains
+        self.run_salt('-t1 "*" saltutil.sync_grains')
         # First-level grain (string value)
         data = self.run_salt('-t 1 -G "test_grain:cheese" test.ping')
         data = '\n'.join(data)
@@ -159,6 +161,11 @@ def test_grain(self):
         data = '\n'.join(data)
         self.assertIn('sub_minion', data)
         self.assertNotIn('minion', data.replace('sub_minion', 'stub'))
+        # Custom grain
+        data = self.run_salt('-t 1 -G "match:maker" test.ping')
+        data = '\n'.join(data)
+        self.assertIn('minion', data)
+        self.assertIn('sub_minion', data)
         # First-level grain (list member)
         data = self.run_salt('-t 1 -G "planets:earth" test.ping')
         data = '\n'.join(data)