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

Add a test for incorrectly-nested nodegroups that cause a resolution loop.

Browse source
This commit is contained in:
Thayne Harbaugh 2015-04-17 17:01:47 -06:00
parent 6c1d4d58e9
commit b37b6b2849
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/files/conf/master
View file

@ -64,3 +64,5 @@ nodegroups:
sub_min: sub_minion
mins: N@min or N@sub_min
redundant_minions: N@min or N@mins
nodegroup_loop_a: N@nodegroup_loop_b
nodegroup_loop_b: N@nodegroup_loop_a

3
tests/integration/shell/matcher.py
View file

@ -91,6 +91,9 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
data = self.run_salt('-N redundant_minions test.ping')
self.assertTrue(minion_in_target('minion', data))
self.assertTrue(minion_in_target('sub_minion', data))
time.sleep(2)
data = '\n'.join(self.run_salt('-N nodegroup_loop_a test.ping'))
self.assertIn('No minions matched', data)
def test_glob(self):
'''