projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bb53c1
)
Avoid nginx startup race in test suite.
author
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 26 Sep 2019 19:27:17 +0000
(15:27 -0400)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 26 Sep 2019 19:27:17 +0000
(15:27 -0400)
If run_test_server.py doesn't wait for nginx to start up before
returning, run-tests.sh might check the pidfile, conclude nginx has
died, and abort.
No issue #
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
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 ccfa1c4825f7da33684d263f12ecf8b7387134eb..48aabbbe409a5c672d7917ae8b57b73973fd7bec 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-640,6
+640,7
@@
def run_nginx():
'-g', 'pid '+_pidfile('nginx')+';',
'-c', conffile],
env=env, stdin=open('/dev/null'), stdout=sys.stderr)
+ _wait_until_port_listens(nginxconf['CONTROLLERSSLPORT'])
def setup_config():
rails_api_port = find_available_port()