taler-deployment

commit d75366790ed7e140049822c142527ffeb38b42cc
parent e24cc456d2df264dd1bc0c020488cb1559c0ce8f
Author: MS <ms@taler.net>
Date:   Wed, 14 Sep 2022 14:06:59 +0200

fix last check

Diffstat:
M
bin/taler-gv
 | 
9
++++-----

1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/bin/taler-gv b/bin/taler-gv
@@ -1536,10 +1536,9 @@ def prepare(postgres_db_name):
 
     print_nn("Launching Nexus...")
     subprocess.run(["systemctl", "--user", "start", "taler-local-nexus.service"])
-    time.sleep(3)
-    print(" OK")
     if not is_serving("https://nexus.demo.taler.net/"):
         fail(f"Nexus did not start correctly.")
+    print(" OK")
     print_nn("Create Exchange account at Nexus...")
     prepare_nexus_account(
         ebics_url=EBICS_URL,
@@ -1705,9 +1704,9 @@ def prepare(postgres_db_name):
 
     print_nn(f"Start merchant (with TALER_MERCHANT_TOKEN into the env)...")
     subprocess.run(["systemctl", "--user", "start", "taler-local-merchant-backend-token.service"], check=True)
-    print(" OK")
     if not is_serving("https://backend.demo.taler.net/"):
         fail(f"Merchant backend (with auth token) did not start correctly.")
+    print(" OK")
     print_nn("Give default instance a bank account...")
     prepare_sandbox_account(
         sandbox_url=SANDBOX_URL,
@@ -1729,10 +1728,10 @@ def prepare(postgres_db_name):
     print_nn("Stopping the merchant with TALER_MERCHANT_TOKEN into the env...")
     subprocess.run(["systemctl", "--user", "stop", "taler-local-merchant-backend-token.service"], check=True)
     print(" OK")
-    if not is_serving("https://backend.demo.taler.net/"):
-        fail(f"Merchant backend (without auth token) did not start correctly.")
     print_nn("Restarting the merchant WITHOUT the auth-token in the env...")
     subprocess.run(["systemctl", "--user", "start", "taler-local-merchant-backend.service"], check=True)
+    if not is_serving("https://backend.demo.taler.net/"):
+        fail(f"Merchant backend (without auth token) did not start correctly.")
     print(" OK")
     for instance in INSTANCES:
         instance_id = instance["name"]