projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a17734
)
8460: Stop existing nginx server, if any, before starting new.
author
Tom Clegg <tom@curoverse.com>
Thu, 17 Nov 2016 20:10:56 +0000
(15:10 -0500)
committer
Tom Clegg <tom@curoverse.com>
Thu, 17 Nov 2016 20:10:56 +0000
(15:10 -0500)
sdk/python/tests/run_test_server.py
patch
|
blob
|
history
diff --git
a/sdk/python/tests/run_test_server.py
b/sdk/python/tests/run_test_server.py
index bd37daa6cdd3c27b8c24252d0ffadb92321044f4..75b4f4d26dee608468a4ed587d26f7c6bc61c175 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-585,6
+585,7
@@
def stop_keep_web():
def run_nginx():
if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ:
return
+ stop_nginx()
nginxconf = {}
nginxconf['KEEPWEBPORT'] = _getport('keep-web')
nginxconf['KEEPWEBDLSSLPORT'] = find_available_port()