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

Never fail on process.terminate() since the process is supposed to have ended.

Browse Source
This commit is contained in:
Pedro Algarvio 2012-11-07 13:58:44 +00:00
parent 8e9fd09eeb
commit b4f2ad2884
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/__init__.py
View File

@ -553,9 +553,8 @@ class ShellCase(TestCase):
try:
process.terminate()
except OSError, err:
if err.errno != 3:
# No such process
raise err
# process already terminated
pass
return out.splitlines(), err.splitlines()
process = subprocess.Popen(
@ -566,9 +565,8 @@ class ShellCase(TestCase):
try:
process.terminate()
except OSError, err:
if err.errno != 3:
# No such process
raise err
# process already terminated
pass
return data[0].splitlines()
def run_salt(self, arg_str):