Merge pull request #49795 from gtmanfred/tests

fix test_managed_file_with_grains_data
saltstack · Sep 26, 2018 · fee6701 · fee6701
2 parents 04e5869 + cf5c179
commit fee6701
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/tests/integration/files/conf/minion b/tests/integration/files/conf/minion
@@ -25,6 +25,7 @@ integration.test: True
 # Grains addons
 grains:
   test_grain: cheese
+  grain_path: /tmp/salt-tests-tmpdir/file-grain-test
   script: grail
   alot: many
   planets:

diff --git a/tests/integration/states/test_file.py b/tests/integration/states/test_file.py
@@ -355,7 +355,6 @@ def test_managed_file_with_grains_data(self):
         file.
         '''
         grain_path = os.path.join(TMP, 'file-grain-test')
-        self.run_function('grains.set', ['grain_path', grain_path])
         state_file = 'file-grainget'
 
         self.run_function('state.sls', [state_file])