From 430ea9e7805ff1278bcb843bf64be6131d5b23fc Mon Sep 17 00:00:00 2001 From: Mike Place Date: Thu, 20 Oct 2016 19:48:59 +0900 Subject: [PATCH] Revert "Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running" --- .gitignore | 1 - tests/integration/__init__.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b4eb585e2b3a..d676e374e3a9 100644 --- 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 index b83d00672caf..14719c365c9a 100644 --- 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)