From b8990f5258810ca641f28282c946c2195c37ab24 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Fri, 13 Apr 2018 16:37:01 -0600 Subject: [PATCH] Pass the timeout variable to the CLI when calling salt in tests --- tests/support/case.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/support/case.py b/tests/support/case.py index 8d0a6033b8..85fafde03a 100644 --- a/tests/support/case.py +++ b/tests/support/case.py @@ -122,7 +122,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertIn('minion', data) ''' arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) - return self.run_script('salt', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr) + return self.run_script('salt', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=timeout) def run_ssh(self, arg_str, with_retcode=False, timeout=25, catch_stderr=False, wipe=False, raw=False):