Changeset: 471a51987b5c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/471a51987b5c
Added Files:
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
Removed Files:
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat
sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
sql/jdbc/tests/Tests/ValidateSystemCatalogTables.test
Branch: default
Log Message:
try fix jdbc test
diffs (178 lines):
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-echo user=monetdb> .monetdb
-echo password=monetdb>> .monetdb
-
-prompt # $t $g
-
-java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" --help
-
-java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f
"%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_create_tables.sql"
-java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f
"%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_inserts_selects.sql"
-java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -D
-java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d "%TSTDB%" -f
"%TSTSRCBASE%\%TSTDIR%\Tests\JdbcClient_drop_tables.sql"
-
-@del .monetdb
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
@@ -0,0 +1,58 @@
+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')
+CLIENT='org.monetdb.client.JdbcClient'
+USER='monetdb'
+PASSWORD='monetdb'
+
+
+if __name__ == '__main__':
+ cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '--help']
+ try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+ except CalledProcessError as e:
+ raise SystemExit(e.stderr)
+ cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f',
os.path.join(TSTSRCBASE, TSTDIR, 'Tests/JdbcClient_create_tables.sql')]
+ try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+ except CalledProcessError as e:
+ print(e.stderr, file=sys.stderr)
+ raise SystemExit('ERROR: failed to create tables!')
+ cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f',
os.path.join(TSTSRCBASE, TSTDIR, 'Tests/JdbcClient_inserts_selects.sql')]
+ try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+ except CalledProcessError as e:
+ print(e.stderr, file=sys.stderr)
+ raise SystemExit('ERROR: failed to insert!')
+ cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-D']
+ try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+ except CalledProcessError as e:
+ raise SystemExit(e.stderr)
+ cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f',
os.path.join(TSTSRCBASE, TSTDIR, 'Tests/JdbcClient_drop_tables.sql')]
+ try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+ except CalledProcessError as e:
+ raise SystemExit(e.stderr)
+
+#set -e
+#
+#cat << EOF > .monetdb
+#user=monetdb
+#password=monetdb
+#EOF
+#
+#java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB --help
+#
+#java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_create_tables.sql
+#java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_inserts_selects.sql
+#java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -D
+#java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_drop_tables.sql
+#
+#rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
-
-java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB --help
-
-java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_create_tables.sql
-java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_inserts_selects.sql
-java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -D
-java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB -f
$TSTSRCBASE/$TSTDIR/Tests/JdbcClient_drop_tables.sql
-
-rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-
-echo user=monetdb> .monetdb
-echo password=monetdb>> .monetdb
-
-prompt # $t $g
-
-call java org.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB% -e
-f "%TSTSRCBASE%\%TSTDIR%\Tests\ValidateSystemCatalogTables.sql"
-
-@del .monetdb
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
@@ -0,0 +1,34 @@
+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')
+CLIENT='org.monetdb.client.JdbcClient'
+USER='monetdb'
+PASSWORD='monetdb'
+
+
+if __name__ == '__main__':
+ cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f',
os.path.join(TSTSRCBASE, TSTDIR, 'Tests/ValidateSystemCatalogTables.sql')]
+ try:
+ p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, text=True)
+ if p.stderr:
+ raise SystemExit(p.stderr)
+ except CalledProcessError as e:
+ raise SystemExit(e.stderr)
+
+
+##!/bin/sh
+#
+#cat << EOF > .monetdb
+#user=monetdb
+#password=monetdb
+#EOF
+#
+#java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$TSTSRCBASE/$TSTDIR/Tests/ValidateSystemCatalogTables.sql
+#
+##rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
-
-java org.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$TSTSRCBASE/$TSTDIR/Tests/ValidateSystemCatalogTables.sql
-
-rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.test
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.test
deleted file mode 100644
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.test
+++ /dev/null
@@ -1,1 +0,0 @@
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
