valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #37110 from saltstack/revert-36875-develop

Browse Source 
Revert "Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running"
This commit is contained in:
Mike Place 2016-10-20 19:49:17 +09:00 committed by GitHub
commit 1e2e56fbbc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -50,7 +50,6 @@ htmlcov/
/*.iml
*.sublime-project
*.sublime-workspace
/.vscode
# ignore ctags file
tags

2
tests/integration/__init__.py
View File

@ -618,7 +618,7 @@ class SaltDaemonScriptBase(SaltScriptBase, ShellTestCase):
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)