Changeset: 2cb6d50db109 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2cb6d50db109
Added Files:
sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
Removed Files:
sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.bat
sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.sh
Modified Files:
sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
Branch: default
Log Message:
Silenced test and cleanup
diffs (74 lines):
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
+++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
@@ -1,5 +1,4 @@
import os
-import sys
from subprocess import run, PIPE, CalledProcessError
HOST=os.getenv('HOST')
@@ -20,15 +19,3 @@ if __name__ == '__main__':
p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, encoding='utf-8')
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/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.bat
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.bat
deleted file mode 100755
--- a/sql/test/sys-schema/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 nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%TSTSRCBASE%\%TSTDIR%\Tests\ValidateSystemCatalogTables.sql"
-
-@del .monetdb
diff --git a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.sh
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
rename from sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.sh
rename to sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
--- a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.sh
+++ b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
@@ -1,10 +1,21 @@
-#!/bin/sh
+import os
+from subprocess import run, PIPE, CalledProcessError
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
+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'
-java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d ${TSTDB} -e -f
$TSTSRCBASE/$TSTDIR/Tests/ValidateSystemCatalogTables.sql
-rm -f .monetdb
+if __name__ == '__main__':
+ with open(os.path.join('.monetdb'), 'w') as f:
+ f.write('\n'.join(['user=monetdb', 'password=monetdb']))
+ 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, encoding='utf-8')
+ except CalledProcessError as e:
+ raise SystemExit(e.stderr)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
