From 8becec2f4f8cca6448838ef989f56baa7e82cbb4 Mon Sep 17 00:00:00 2001
From: Mike Place <mp@saltstack.com>
Date: Fri, 22 Jul 2016 17:22:50 -0600
Subject: [PATCH] Backport #34906

---
 tests/integration/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
index 577a512d6d80..3b04964670cf 100644
--- 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
         '''