From 2dcb92134db68de56b6cf16479f0a3f527479e7e Mon Sep 17 00:00:00 2001 From: Mike Place Date: Thu, 29 Sep 2016 13:23:26 +0900 Subject: [PATCH] Fix race between minion job timeout and cli test timeout --- tests/integration/cli/grains.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cli/grains.py b/tests/integration/cli/grains.py index 37a66c3ce2..0d44c5e822 100644 --- a/tests/integration/cli/grains.py +++ b/tests/integration/cli/grains.py @@ -70,7 +70,7 @@ class GrainsTargetingTest(integration.ShellCase): # ping disconnected minion and ensure it times out and returns with correct message try: ret = '' - for item in self.run_salt('-G \'id:disconnected\' test.ping'): + for item in self.run_salt('-t 1 -G \'id:disconnected\' test.ping', timeout=30): if item != 'disconnected:': ret = item.strip() self.assertEqual(ret, test_ret)