valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #34997 from saltstack/revert-34990-decode-bytes-integration-init

Browse Source 
Revert "Decode byte strings when running tests in Python 3"
This commit is contained in:
Mike Place 2016-07-27 13:00:57 -06:00 committed by GitHub
commit bd995c014d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/__init__.py
View File

@ -566,7 +566,7 @@ class SaltDaemonScriptBase(SaltScriptBase, ShellTestCase):
del sock
elif isinstance(port, str):
joined = self.run_run('manage.joined', config_dir=self.config_dir)
joined = [x.decode().lstrip('- ') for x in joined]
joined = [x.lstrip('- ') for x in joined]
if port in joined:
check_ports.remove(port)
yield gen.sleep(0.125)