saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #40016 from terminalmage/fix-grains-test

Browse source 
Attempt to fix failing grains tests in 2016.3
This commit is contained in:
Nicole Thomas 2017-03-14 12:34:31 -06:00 • committed by GitHub
commit 26895b7be2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/integration/modules/grains.py
View file

@ -142,9 +142,8 @@ class GrainsAppendTestCase(integration.ModuleCase):
GRAIN_VAL = 'my-grain-val'
def tearDown(self):
test_grain = self.run_function('grains.get', [self.GRAIN_KEY])
if test_grain and test_grain == [self.GRAIN_VAL]:
self.run_function('grains.remove', [self.GRAIN_KEY, self.GRAIN_VAL])
for item in self.run_function('grains.get', [self.GRAIN_KEY]):
self.run_function('grains.remove', [self.GRAIN_KEY, item])
def test_grains_append(self):
'''