sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

traffic: evoke OS error codes by name, not number

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall
2018-11-22 13:00:04 +13:00
committed by Douglas Bagnall
parent 35bc6ee0a1
commit 22cba7011c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/emulate/traffic.py
View File

@ -25,6 +25,7 @@ import json
import math
import sys
import signal
from errno import ECHILD, ESRCH
from collections import OrderedDict, Counter, defaultdict, namedtuple
from samba.emulate import traffic_packets
@ -1617,7 +1618,7 @@ def replay(conversation_seq,
try:
os.kill(pid, s)
except OSError as e:
if e.errno != 3: # don't fail if it has already died
if e.errno != ESRCH: # don't fail if it has already died
raise
time.sleep(0.5)
end = time.time() + 1
@ -1625,7 +1626,7 @@ def replay(conversation_seq,
try:
pid, status = os.waitpid(-1, os.WNOHANG)
except OSError as e:
if e.errno != 10:
if e.errno != ECHILD:
raise
if pid != 0:
c = children.pop(pid, None)