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

Fixing the last text failure.

Browse source
This commit is contained in:
Gareth J. Greenaway 2017-06-08 20:03:05 -07:00 • committed by rallytime
parent 4d3399c6c4
commit 53a216378c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/integration/files/pillar/base/top.sls
View file

@ -2,6 +2,7 @@ base:
'minion':
- generic
- blackout
- gpg
'sub_minion':
- generic
- blackout

2
tests/support/mixins.py
View file

@ -620,7 +620,7 @@ class SaltReturnAssertsMixin(object):
def assertInSaltReturnRegexpMatches(self, ret, pattern, keys=()):
for saltret in self.__getWithinSaltReturn(ret, keys):
self.assertRegexpMatches(saltret, pattern)
self.assertRegex(saltret, pattern)
def assertSaltStateChangesEqual(self, ret, comparison, keys=()):
keys = ['changes'] + self.__return_valid_keys(keys)