tests: move nginx check in scenarios lib

This commit is contained in:
Jonas Nick 2020-08-04 12:17:15 +00:00
parent 5c0170c6b8
commit 4ece2da8db
No known key found for this signature in database
GPG Key ID: 4861DBF262123605

View File

@ -59,7 +59,6 @@ def run_tests(extra_tests):
extra_tests.pop("electrs")() extra_tests.pop("electrs")()
# Check RPC connection to bitcoind # Check RPC connection to bitcoind
machine.wait_until_succeeds(log_has_string("electrs", "NetworkInfo")) machine.wait_until_succeeds(log_has_string("electrs", "NetworkInfo"))
assert_running("nginx")
# Stop electrs from spamming the test log with 'wait for bitcoind sync' messages # Stop electrs from spamming the test log with 'wait for bitcoind sync' messages
succeed("systemctl stop electrs") succeed("systemctl stop electrs")
@ -86,6 +85,7 @@ def run_tests(extra_tests):
# to incomplete unit dependencies. # to incomplete unit dependencies.
# 'create-web-index' implicitly tests 'nodeinfo'. # 'create-web-index' implicitly tests 'nodeinfo'.
machine.wait_for_unit("create-web-index") machine.wait_for_unit("create-web-index")
assert_running("nginx")
extra_tests.pop("web-index")() extra_tests.pop("web-index")()
machine.wait_until_succeeds(log_has_string("bitcoind-import-banlist", "Importing node banlist")) machine.wait_until_succeeds(log_has_string("bitcoind-import-banlist", "Importing node banlist"))