kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-23 11:27:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/set-bitcoind-rpcbind

Browse Source
This commit is contained in:
Aaron Blankstein
2018-01-10 16:47:42 -05:00
parent fc1ce36ba4 f901aa8c8f
commit d45421c14f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
integration_tests/bin/blockstack-test-scenario
View File

@@ -731,7 +731,6 @@ def run_scenario( scenario, config_file, client_config_file, interactive=False,
def signal_shutdown_procedure(*args, **kw):
shutdown_procedure()
exit(1)
def signal_reap_children(*args, **kw):
"""
@@ -747,11 +746,19 @@ def run_scenario( scenario, config_file, client_config_file, interactive=False,
else:
raise
def running_in_docker():
try:
with open('/proc/1/cpuset') as cpuset:
content = [l for l in cpuset][0]
return content.startswith('/docker/')
except:
return False
signal.signal(signal.SIGINT, signal_shutdown_procedure)
signal.signal(signal.SIGQUIT, signal_shutdown_procedure)
signal.signal(signal.SIGTERM, signal_shutdown_procedure)
if SCENARIO_PID == 1:
if SCENARIO_PID == 1 and not running_in_docker():
signal.signal(signal.SIGCHLD, signal_reap_children)
rpcclient = None