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

Switch open() for salt.utils.fopen()

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-26 23:35:31 +00:00
parent 1857a0d31f
commit bea345e720
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/shell/master.py
View File

@ -61,8 +61,9 @@ class MasterTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
# Now kill it if still running
if os.path.exists(pid_path):
with salt.utils.fopen(pid_path) as fhr:
try:
os.kill(int(open(pid_path).read()), signal.SIGKILL)
os.kill(int(fhr.read()), signal.SIGKILL)
except OSError:
pass
try: