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

Revert "Back-port #36875 to carbon"

Browse source
This commit is contained in:
Mike Place 2016-10-20 19:49:45 +09:00 • committed by GitHub
parent f26475753e
commit 3179303a5d
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

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

2
tests/integration/__init__.py
View file

@ -618,7 +618,7 @@ class SaltDaemonScriptBase(SaltScriptBase, ShellTestCase):
pass pass
del sock del sock
elif isinstance(port, str): 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] joined = [x.lstrip('- ') for x in joined]
if port in joined: if port in joined:
check_ports.remove(port) check_ports.remove(port)