Merge pull request #34911 from cachedout/backport_34906

Backport #34906
saltstack · Jul 22, 2016 · 34dc2fd · 34dc2fd
2 parents 6ccc27f + 8becec2
commit 34dc2fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -1211,7 +1211,7 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase):
     _script_dir_ = SCRIPT_DIR
     _python_executable_ = PYEXEC
 
-    def run_salt(self, arg_str, with_retcode=False, catch_stderr=False):
+    def run_salt(self, arg_str, with_retcode=False, catch_stderr=False, timeout=15):  # pylint: disable=W0221
         '''
         Execute salt
         '''