Changeset: 0593aab8edfa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0593aab8edfa
Added Files:
sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
Removed Files:
sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.bat
sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.sh
sql/jdbc/tests/Tests/Test.SQL.bat
Branch: default
Log Message:
refactor jdbc JDBC_API_Tester test
diffs (64 lines):
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.bat
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.bat
+++ /dev/null
@@ -1,1 +0,0 @@
-@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
@@ -0,0 +1,33 @@
+import os
+import sys
+from subprocess import run, PIPE, CalledProcessError
+
+HOST=os.getenv('HOST')
+MAPIPORT=os.getenv('MAPIPORT')
+TSTDB=os.getenv('TSTDB')
+TSTSRCBASE=os.getenv('TSTSRCBASE')
+TSTDIR=os.getenv('TSTDIR')
+USER='monetdb'
+PASSWORD='monetdb'
+JDBC_EXTRA_ARGS=os.getenv('JDBC_EXTRA_ARGS', default='')
+
+URL=f"jdbc:monetdb://{HOST}:{MAPIPORT}/{TSTDB}?user=monetdb&password=monetdb{JDBC_EXTRA_ARGS}"
+
+cmd = ['java', 'JDBC_API_Tester', URL]
+try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+except CalledProcessError as e:
+ raise SystemExit(e.stderr)
+
+
+
+##!/bin/sh
+#
+#URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
+#TST=$1
+#
+#java ${TST} "${URL}"
+#
+##!/bin/sh
+#
+#$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.sh
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test.SQL.bat
b/sql/jdbc/tests/Tests/Test.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test.SQL.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-set
URL=jdbc:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?user=monetdb^&password=monetdb%JDBC_EXTRA_ARGS%
-
-prompt # $t $g
-
-java %TST% "%URL%"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
