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

Don't traceback if the process is no longer running.

Browse source
This commit is contained in:
Pedro Algarvio 2016-05-10 14:05:32 +01:00
parent e1e1aeb3d7
commit 177d9c4ead
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/integration/__init__.py
View file

@ -14,6 +14,7 @@ import copy
import json
import time
import stat
import errno
import signal
import shutil
import pprint
@ -401,7 +402,11 @@ class SaltDaemonScriptBase(SaltScriptBase):
time.sleep(0.125)
except (SystemExit, KeyboardInterrupt):
# Let's close the terminal now that we're done with it
terminal.send_signal(signal.SIGTERM)
try:
terminal.send_signal(signal.SIGTERM)
except OSError as exc:
if exc.errno != errno.ESRCH:
raise
terminal.communicate()
self.exitcode = terminal.returncode
try: