Revert "Fix integration tests launching - remove redundant "config_di…

…r" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running"
mcpanayides · Oct 20, 2016 · 430ea9e · 430ea9e
1 parent c00da99
commit 430ea9e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,7 +50,6 @@ htmlcov/
 /*.iml
 *.sublime-project
 *.sublime-workspace
-/.vscode
 
 # ignore ctags file
 tags

diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -618,7 +618,7 @@ def _wait_until_running(self):
                                 pass
                     del sock
                 elif isinstance(port, str):
-                    joined = self.run_run('manage.joined')
+                    joined = self.run_run('manage.joined', config_dir=self.config_dir)
                     joined = [x.lstrip('- ') for x in joined]
                     if port in joined:
                         check_ports.remove(port)