Changeset: fab5fca26290 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fab5fca26290 Added Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py sql/test/emptydb-upgrade-chain/Tests/upgrade.py sql/test/emptydb-upgrade-hge/Tests/upgrade.py sql/test/emptydb-upgrade/Tests/upgrade.py Removed Files: sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py.src sql/test/emptydb-upgrade-chain/Tests/dump.reqtests sql/test/emptydb-upgrade-chain/Tests/dump.sql sql/test/emptydb-upgrade-chain/Tests/dump.stable.err sql/test/emptydb-upgrade-chain/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade-chain/Tests/dump.stable.out sql/test/emptydb-upgrade-chain/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade-chain/Tests/unpackage.py sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.err sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.reqtests sql/test/emptydb-upgrade-chain/Tests/upgrade.sql sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py.src sql/test/emptydb-upgrade-hge/Tests/dump.reqtests sql/test/emptydb-upgrade-hge/Tests/dump.sql sql/test/emptydb-upgrade-hge/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.py sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.reqtests sql/test/emptydb-upgrade-hge/Tests/upgrade.sql sql/test/emptydb-upgrade/Tests/dump.SQL.py.src sql/test/emptydb-upgrade/Tests/dump.reqtests sql/test/emptydb-upgrade/Tests/dump.sql sql/test/emptydb-upgrade/Tests/dump.stable.err sql/test/emptydb-upgrade/Tests/dump.stable.err-noapprove sql/test/emptydb-upgrade/Tests/dump.stable.out sql/test/emptydb-upgrade/Tests/dump.stable.out-noapprove sql/test/emptydb-upgrade/Tests/unpackage.py sql/test/emptydb-upgrade/Tests/unpackage.stable.err sql/test/emptydb-upgrade/Tests/unpackage.stable.out sql/test/emptydb-upgrade/Tests/upgrade.reqtests sql/test/emptydb-upgrade/Tests/upgrade.sql sql/test/emptydb/Tests/load.sql sql/test/emptydb/Tests/load.stable.err sql/test/emptydb/Tests/load.stable.out Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/All sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/All sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 testing/Mtest.py.in testing/Mz.py.in Branch: mtest Log Message:
Converted emptydb* tests. diffs (truncated from 2458 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/All b/sql/test/emptydb-upgrade-chain-hge/Tests/All --- a/sql/test/emptydb-upgrade-chain-hge/Tests/All +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/All @@ -1,5 +1,3 @@ -HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY?unpackage HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY?upgrade HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY&RELEASERUN?package -HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY?dump KNOWNFAIL&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_LIBPCRE&HAVE_SHP?check diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/../../emptydb/Tests/dump.SQL.py diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests +++ /dev/null @@ -1,1 +0,0 @@ -upgrade diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.sql +++ /dev/null @@ -1,1 +0,0 @@ -\D diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err-noapprove b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err-noapprove deleted file mode 100644 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 +++ /dev/null @@ -1,37 +0,0 @@ -stderr of test 'dump` in directory 'sql/test/emptydb-upgrade-chain-hge` itself: - - -# 16:42:40 > -# 16:42:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31377" "--set" "mapi_usock=/var/tmp/mtest-18658/.s.monetdb.31377" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain-hge" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 16:42:40 > - -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 31377 -# cmdline opt mapi_usock = /var/tmp/mtest-18658/.s.monetdb.31377 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain-hge -# cmdline opt mal_listing = 0 -# cmdline opt embedded_r = yes -# cmdline opt gdk_debug = 536870922 - -# 16:42:40 > -# 16:42:40 > "/usr/bin/python2" "dump.SQL.py" "dump" -# 16:42:40 > - - -# 16:42:41 > -# 16:42:41 > "Done." -# 16:42:41 > - diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out-noapprove b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out-noapprove deleted file mode 100644 diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128 deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128 +++ /dev/null @@ -1,34 +0,0 @@ -stdout of test 'dump` in directory 'sql/test/emptydb-upgrade-chain-hge` itself: - - -# 16:42:40 > -# 16:42:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31377" "--set" "mapi_usock=/var/tmp/mtest-18658/.s.monetdb.31377" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain-hge" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 16:42:40 > - -# MonetDB 5 server v11.21.16 (hg id: c20b591c1c70+) -# This is an unreleased version -# Serving database 'mTests_sql_test_emptydb-upgrade-chain-hge', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.589 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:31377/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18658/.s.monetdb.31377 -# MonetDB/GIS module loaded -# Start processing logs sql/sql_logs version 52200 -# Start reading the write-ahead log 'sql_logs/sql/log.3' -# Finished reading the write-ahead log 'sql_logs/sql/log.3' -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded -# MonetDB/R module loaded - - -# 16:42:40 > -# 16:42:40 > "/usr/bin/python2" "dump.SQL.py" "dump" -# 16:42:40 > - -# 17:29:11 > -# 17:29:11 > "Done." -# 17:29:11 > - diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py b/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py +++ /dev/null @@ -1,11 +0,0 @@ -import os, sys, zipfile - -dbfarm = os.environ['GDK_DBFARM'] -db = os.path.join(dbfarm, os.environ['TSTDB']) -archive = os.path.join(dbfarm, 'prevhgechainrelempty.zip') -if not os.path.exists(archive): - sys.exit(1) - -z = zipfile.ZipFile(archive) -z.extractall(db) -z.close() diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'unpackage` in directory 'sql/test/emptydb-upgrade-chain-hge` itself: - - -# 16:35:38 > -# 16:35:38 > "/usr/bin/python2" "unpackage.py" "unpackage" -# 16:35:38 > - - -# 16:35:38 > -# 16:35:38 > "Done." -# 16:35:38 > - diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 +++ /dev/null @@ -1,12 +0,0 @@ -stdout of test 'unpackage` in directory 'sql/test/emptydb-upgrade-chain-hge` itself: - - -# 16:35:38 > -# 16:35:38 > "/usr/bin/python2" "unpackage.py" "unpackage" -# 16:35:38 > - - -# 16:35:38 > -# 16:35:38 > "Done." -# 16:35:38 > - diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py new file mode 100644 --- /dev/null +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py @@ -0,0 +1,77 @@ +#!/usr/bin/env python3 + +# When called in the test environment, this is called with exactly one +# argument: the name of the test. +# When called without argument, we dump the server output so that it +# can be saved to be tested against. +try: + from MonetDBtesting import process +except ImportError: + import process + +import sys +import os +import zipfile + +# find zipped database +dbfarm = os.environ['GDK_DBFARM'] +db = os.path.join(dbfarm, os.environ['TSTDB']) +archive = os.path.join(dbfarm, 'prevhgechainrelempty.zip') +if not os.path.exists(archive): + print('file "{}" not found'.format(archive), file=sys.stderr) + sys.exit(1) + +# unpackage database +with zipfile.ZipFile(archive) as z: + z.extractall(path=db) + +# start server and dump database +with process.server(mapiport='0', + stdin=process.PIPE, + stdout=process.PIPE, + stderr=process.PIPE) as srv: + with process.client(lang='sqldump', + stdin=process.PIPE, + stdout=process.PIPE, + stderr=process.PIPE, + server=srv) as clt: + cltout, clterr = clt.communicate() + srvout, srverr = srv.communicate() + +srvout = [line for line in srvout.splitlines(keepends=True) if not line.startswith('#')] +cltout = [line for line in cltout.splitlines(keepends=False) if not line.startswith('--')] + +# check server output (upgrade commands) and check dump (empty) +if len(sys.argv) == 2 and sys.argv[1] == 'upgrade': + bits = os.getenv('TST_BITS') + if bits: + bits = ['.' + bits, ''] + else: + bits = [''] + arch = os.uname()[4] + arch = ['.' + arch, ''] + hge = os.getenv('HAVE_HGE') + if hge: + hge = ['.int128', ''] + else: + hge = [''] + found = False + for b in bits: + for a in arch: + for h in hge: + f = 'upgrade.stable.out{}{}{}'.format(b, a, h) + found = os.path.exists(f) + if found: + break + if found: + break + if found: + break + stable = open(f).readlines() + import difflib + for line in difflib.unified_diff(stable, srvout, fromfile='test', tofile=f): + sys.stderr.write(line) + if len(cltout) != 2 or cltout[0] != 'START TRANSACTION;' or cltout[1] != 'COMMIT;': + sys.stderr.writelines(cltout) +else: + sys.stdout.writelines(srvout) diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.reqtests b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.reqtests deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.reqtests +++ /dev/null @@ -1,1 +0,0 @@ -unpackage diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql deleted file mode 100644 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql +++ /dev/null @@ -1,1 +0,0 @@ -select 1; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -1,21 +1,3 @@ -stdout of test 'upgrade` in directory 'sql/test/emptydb-upgrade-chain-hge` itself: - - -# 16:53:39 > -# 16:53:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39660" "--set" "mapi_usock=/var/tmp/mtest-30908/.s.monetdb.39660" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain-hge" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 16:53:39 > - -# MonetDB 5 server v11.21.16 (hg id: c20b591c1c70+) -# This is an unreleased version -# Serving database 'mTests_sql_test_emptydb-upgrade-chain-hge', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.589 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 -# MonetDB/GIS module loaded Running database upgrade commands: set schema "sys"; delete from sys.dependencies where id < 2000; @@ -4235,20 +4217,3 @@ ALTER TABLE sys.keywords SET READ ONLY; ALTER TABLE sys.table_types SET READ ONLY; set schema "sys"; -# MonetDB/SQL module loaded - -# 15:17:55 > -# 15:17:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6495" "--port=30245" -# 15:17:55 > - -#select 1; -% .%2 # table_name -% %2 # name -% tinyint # type -% 1 # length -[ 1 ] - -# 16:53:39 > -# 16:53:39 > "Done." _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
