saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (#36875)

Browse source 
* Add Visual Studio Code related directory .vscode/ to .gitignore

* 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:
Andrew Pashkin 2016-10-12 22:20:30 +03:00 • committed by Nicole Thomas
parent 046aa22409
commit 304516420c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -50,6 +50,7 @@ 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', config_dir=self.config_dir)
joined = self.run_run('manage.joined')
joined = [x.lstrip('- ') for x in joined]
if port in joined:
check_ports.remove(port)