summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMS <ms@taler.net>2021-01-26 15:20:08 +0100
committerMS <ms@taler.net>2021-01-26 15:20:08 +0100
commit1777f8f4870074bdb84f7a2534280765167ac1d1 (patch)
treea5af3bb43f9d57641ccc1f5ca911992b9a02fe34
parentd6168f4f06c7a53ad710f1ac5a39cbacc031e5c5 (diff)
downloadlibeufin-1777f8f4870074bdb84f7a2534280765167ac1d1.tar.gz
libeufin-1777f8f4870074bdb84f7a2534280765167ac1d1.tar.bz2
libeufin-1777f8f4870074bdb84f7a2534280765167ac1d1.zip
command line DB string gone (from tests)
-rwxr-xr-xintegration-tests/tests.py3
-rw-r--r--integration-tests/util.py20
2 files changed, 13 insertions, 10 deletions
diff --git a/integration-tests/tests.py b/integration-tests/tests.py
index b4d0a3ed..58760290 100755
--- a/integration-tests/tests.py
+++ b/integration-tests/tests.py
@@ -31,6 +31,9 @@ PERSONA = LibeufinPersona(
ebics_details = EbicsDetails(SANDBOX_URL + "/ebicsweb")
)
+os.environ["LIBEUFIN_NEXUS_DB_CONNECTION"] = DB
+os.environ["LIBEUFIN_SANDBOX_DB_CONNECTION"] = DB
+
def prepareSandbox():
# make ebics host at sandbox
assertResponse(
diff --git a/integration-tests/util.py b/integration-tests/util.py
index df5ad03c..9e9b19d6 100644
--- a/integration-tests/util.py
+++ b/integration-tests/util.py
@@ -102,36 +102,36 @@ def kill(name, s):
s.terminate()
s.wait()
-def makeNexusSuperuser(dbConnString):
+def makeNexusSuperuser():
check_call([
"../gradlew",
"-q", "--console=plain",
"-p", "..",
"nexus:run",
- f"--args=superuser admin --password x --db-conn-string={dbConnString}",
+ f"--args=superuser admin --password x",
])
-def dropSandboxTables(dbConnString):
+def dropSandboxTables():
check_call([
"../gradlew",
"-q", "--console=plain",
"-p", "..",
"sandbox:run",
- f"--args=reset-tables --db-conn-string={dbConnString}"
+ f"--args=reset-tables"
])
-def dropNexusTables(dbConnString):
+def dropNexusTables():
check_call([
"../gradlew",
"-q", "--console=plain",
"-p", "..",
"nexus:run",
- f"--args=reset-tables --db-conn-string={dbConnString}"
+ f"--args=reset-tables"
])
-def startSandbox(dbConnString):
+def startSandbox():
check_call(["../gradlew", "-q", "--console=plain", "-p", "..", "sandbox:assemble"])
checkPort(5000)
sandbox = Popen([
@@ -141,7 +141,7 @@ def startSandbox(dbConnString):
"..",
"sandbox:run",
"--console=plain",
- "--args=serve --db-conn-string={}".format(dbConnString)],
+ "--args=serve"],
stdin=DEVNULL,
stdout=open("sandbox-stdout.log", "w"),
stderr=open("sandbox-stderr.log", "w")
@@ -161,7 +161,7 @@ def startSandbox(dbConnString):
break
-def startNexus(dbConnString):
+def startNexus():
check_call(
["../gradlew", "-q", "--console=plain", "-p", "..", "nexus:assemble",]
)
@@ -173,7 +173,7 @@ def startNexus(dbConnString):
"..",
"nexus:run",
"--console=plain",
- "--args=serve --db-conn-string={}".format(dbConnString)],
+ "--args=serve")],
stdin=DEVNULL,
stdout=open("nexus-stdout.log", "w"),
stderr=open("nexus-stderr.log", "w")