libeufin

commit e30e0ba3866fe79dca0e02a74ec9de033ab732f5
parent 4c54e8ea1446db260db9293ad3b2f5c90305730e
Author: MS <ms@taler.net>
Date:   Mon,  8 Jun 2020 16:08:34 +0200

Custom DB name for sandbox, too.

Diffstat:
M
integration-tests/test-taler-facade.py
 | 
19
++-----------------
M
integration-tests/util.py
 | 
4
++--

2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/integration-tests/test-taler-facade.py b/integration-tests/test-taler-facade.py
@@ -44,16 +44,6 @@ def fail(msg):
     print(msg)
     exit(1)
 
-def checkPorts(ports):
-    for i in ports:
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            s.bind(("0.0.0.0", i))
-            s.close()
-        except:
-            print("Port {} is not available".format(i))
-            exit(77)
-
 def assertResponse(response):
     if response.status_code != 200:
         print("Test failed on URL: {}".format(response.url))
@@ -64,10 +54,8 @@ def assertResponse(response):
     # Allows for finer grained checks.
     return response
 
-
-os.chdir("..")
 startNexus(NEXUS_DB)
-startSandbox()
+startSandbox(SANDBOX_DB)
 
 # make ebics host at sandbox
 assertResponse(
@@ -195,7 +183,4 @@ assertResponse(
 #    )
 #)
 
-print("sleeping 100s")
-sleep(100)
-
-print("Test passed!")
+input("press enter to stop the test:")
diff --git a/integration-tests/util.py b/integration-tests/util.py
@@ -18,8 +18,8 @@ def checkPort(port):
         exit(77)
 
 
-def startSandbox():
-    db_full_path = str(Path.cwd() / "libeufin-sandbox.sqlite3")
+def startSandbox(dbname = "libeufin-sandbox.sqlite3"):
+    db_full_path = str(Path.cwd() / dbname)
     check_call(["rm", "-f", db_full_path])
     check_call(["../gradlew", "-p", "..", "sandbox:assemble"])
     checkPort(5000)