From 978ae5fb51d5610a615984d787f77f15f3317956 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 15 Jul 2014 15:43:46 -0400 Subject: [PATCH] Make sure test_grain passes with raet --- tests/integration/shell/matcher.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/integration/shell/matcher.py b/tests/integration/shell/matcher.py index 0bb7696f4d..b0751a023c 100644 --- a/tests/integration/shell/matcher.py +++ b/tests/integration/shell/matcher.py @@ -108,10 +108,18 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn): self.assertIn('sub_minion', data) self.assertNotIn('minion', data.replace('sub_minion', 'stub')) data = self.run_salt('-G "planets:pluto" test.ping') + expect = None + if self.master_opts['transport'] == 'zeromq': + expect = ( + 'No minions matched the target. ' + 'No command was sent, no jid was ' + 'assigned.' + ) + elif self.master_opts['transport'] == 'raet': + expect = '' self.assertEqual( ''.join(data), - 'No minions matched the target. No command was sent, no jid was ' - 'assigned.' + expect ) # Nested grain (string value) data = self.run_salt('-t 1 -G "level1:level2:foo" test.ping')