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 2

Make some adjustments after resolving merge conflict

Browse source
This commit is contained in:
rallytime 2016-08-01 18:32:28 -06:00
parent 1f45d906c8
commit d787140861
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/integration/shell/minion.py
View file

@ -25,6 +25,7 @@ ensure_in_syspath('../../')
# Import salt libs
import integration
import integration.utils
from integration.utils import testprogram
import salt.ext.six as six
import salt.utils
@ -249,7 +250,7 @@ class MinionTest(integration.ShellCase, testprogram.TestProgramCase, integration
# Verify that PIDs match
mpids = {}
for line in ret[0]:
segs = line.split()
segs = line.decode(__salt_system_encoding__).split()
minfo = segs[0].split(':')
mpids[minfo[-1]] = int(segs[-1]) if segs[-1].isdigit() else None
for minion in minions:
@ -294,7 +295,7 @@ class MinionTest(integration.ShellCase, testprogram.TestProgramCase, integration
status, 'EX_NOUSER',
message='unknown user not on system',
stdout=stdout,
stderr=stderr[0].decode(__salt_system_encoding__)
stderr=integration.utils.decode_byte_list(stderr)
)
# minion.shutdown() should be unnecessary since the start-up should fail
@ -319,7 +320,7 @@ class MinionTest(integration.ShellCase, testprogram.TestProgramCase, integration
status, 'EX_USAGE',
message='unknown argument',
stdout=stdout,
stderr=stderr[0].decode(__salt_system_encoding__)
stderr=integration.utils.decode_byte_list(stderr)
)
# minion.shutdown() should be unnecessary since the start-up should fail