Changeset: e3daed8f0b6d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3daed8f0b6d Removed Files: sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.err sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.out sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.timeout Modified Files: sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.err sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.out sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.err sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out Branch: mtest Log Message:
Silenced BugTracker-2015 tests and removed unused test diffs (truncated from 668 to 300 lines): diff --git a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py --- a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py +++ b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py @@ -21,7 +21,6 @@ def query(conn, sql): return r def run(conn, sql): - print(sql) r = conn.execute(sql) # boring setup and schema creation stuff: @@ -40,9 +39,11 @@ try: run(c1, 'commit') print("shouldn't get here") except pymonetdb.IntegrityError: - print("commit failed") pass run(c1, 'insert into foo_2017 values (4),(5),(6)') # SIGABRT here run(c1, 'drop view bar') run(c1, 'drop table foo_2017') + +c1.close() +c2.close() diff --git a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.err b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.err --- a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.err +++ b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.err @@ -5,31 +5,6 @@ stderr of test 'acidity2-fail.Bug-3635` # 14:09:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33768" "--set" "mapi_usock=/var/tmp/mtest-23800/.s.monetdb.33768" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" # 14:09:16 > -# builtin opt gdk_dbpath = /home/niels/scratch/rc-clean/Linux-x86_64/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 = 33768 -# cmdline opt mapi_usock = /var/tmp/mtest-23800/.s.monetdb.33768 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015 -# cmdline opt mal_listing = 0 -# cmdline opt embedded_r = yes -# cmdline opt gdk_debug = 536870922 - -# 14:09:16 > -# 14:09:16 > "/usr/bin/python2" "acidity2-fail.Bug-3635.SQL.py" "acidity2-fail.Bug-3635" -# 14:09:16 > - # 14:09:16 > # 14:09:16 > "Done." diff --git a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.out b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.out --- a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.out +++ b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.stable.out @@ -5,38 +5,6 @@ stdout of test 'acidity2-fail.Bug-3635` # 14:09:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33768" "--set" "mapi_usock=/var/tmp/mtest-23800/.s.monetdb.33768" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" # 14:09:16 > -# MonetDB 5 server v11.19.8 -# This is an unreleased version -# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 7.333 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://localhost.nes.nl:33768/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23800/.s.monetdb.33768 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/R module loaded - - -# 14:09:16 > -# 14:09:16 > "/usr/bin/python2" "acidity2-fail.Bug-3635.SQL.py" "acidity2-fail.Bug-3635" -# 14:09:16 > - -create table foo_2017 (a int) -insert into foo_2017 values (1),(2),(3) -create view bar as select * from foo_2017 -start transaction -delete from foo_2017 -drop view bar -create view bar as select * from foo_2017 -create table baz (a int);drop table baz -commit -commit failed -insert into foo_2017 values (4),(5),(6) -drop view bar -drop table foo_2017 # 14:09:16 > # 14:09:16 > "Done." diff --git a/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py b/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py deleted file mode 100644 --- a/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.SQL.py +++ /dev/null @@ -1,53 +0,0 @@ -import threading, sys - -try: - from MonetDBtesting import process -except ImportError: - import process - -NITER = 1000 - -with process.client('sql', stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE) as c: - out, err = c.communicate('create table test3848 (col1 bigint, col2 varchar(1024));') - sys.stdout.write(out) - sys.stderr.write(err) -with process.client('sql', stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE) as c: - c.stdin.write("copy 1000000 records into test3848 from stdin using delimiters ',', '\\n', '\"';") - for i in range(1000000): - c.stdin.write('%d,"something old"\n' % i) - out, err = c.communicate() - sys.stdout.write(out) - sys.stderr.write(err) - -class Client(threading.Thread): - def __init__(self, query): - self.query = query - self.out = [] - self.err = [] - threading.Thread.__init__(self) - - def run(self): - for i in range(NITER): - with process.client('sql', stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE) as c: - out, err = c.communicate(self.query) - # self.out.append(out) - # self.err.append(err) - - def output(self): - sys.stdout.write(''.join(self.out)) - sys.stderr.write(''.join(self.err)) - -rdr = Client('select * from test3848 where col1 % 1000 = 0;') -wtr = Client("start transaction; update test3848 set col2 = 'something new' where col1 % 1000 = 0; commit;") - -rdr.start() -wtr.start() -rdr.join() -wtr.join() -rdr.output() -wtr.output() - -with process.client('sql', stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE) as c: - out, err = c.communicate('drop table test3848;') - sys.stdout.write(out) - sys.stderr.write(err) diff --git a/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.err b/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.err deleted file mode 100644 --- a/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.err +++ /dev/null @@ -1,37 +0,0 @@ -stderr of test 'concurrent-queries.Bug-3848` in directory 'sql/test/BugTracker-2015` itself: - - -# 17:09:15 > -# 17:09:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37463" "--set" "mapi_usock=/var/tmp/mtest-26477/.s.monetdb.37463" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 17:09:15 > - -# 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 = 37463 -# cmdline opt mapi_usock = /var/tmp/mtest-26477/.s.monetdb.37463 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015 -# cmdline opt mal_listing = 0 -# cmdline opt embedded_r = yes -# cmdline opt gdk_debug = 536870922 - -# 17:09:16 > -# 17:09:16 > "/usr/bin/python2" "concurrent-queries.Bug-3848.SQL.py" "concurrent-queries.Bug-3848" -# 17:09:16 > - - -# 17:14:38 > -# 17:14:38 > "Done." -# 17:14:38 > - diff --git a/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.out b/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.out deleted file mode 100644 --- a/sql/test/BugTracker-2015/Tests/concurrent-queries.Bug-3848.stable.out +++ /dev/null @@ -1,97 +0,0 @@ -stdout of test 'concurrent-queries.Bug-3848` in directory 'sql/test/BugTracker-2015` itself: - - -# 17:09:15 > -# 17:09:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37463" "--set" "mapi_usock=/var/tmp/mtest-26477/.s.monetdb.37463" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 17:09:15 > - -# MonetDB 5 server v11.21.12 (hg id: 2258d77bd826) -# This is an unreleased version -# Serving database 'mTests_sql_test_BugTracker-2015', 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:37463/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-26477/.s.monetdb.37463 -# MonetDB/GIS module loaded -# Start processing logs sql/sql_logs version 52200 -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded -# MonetDB/R module loaded - -# SQL catalog created, loading sql scripts once -# loading sql script: 09_like.sql -# loading sql script: 10_math.sql -# loading sql script: 11_times.sql -# loading sql script: 12_url.sql -# loading sql script: 13_date.sql -# loading sql script: 14_inet.sql -# loading sql script: 15_querylog.sql -# loading sql script: 16_tracelog.sql -# loading sql script: 17_temporal.sql -# loading sql script: 20_vacuum.sql -# loading sql script: 21_dependency_functions.sql -# loading sql script: 22_clients.sql -# loading sql script: 23_skyserver.sql -# loading sql script: 24_zorder.sql -# loading sql script: 25_debug.sql -# loading sql script: 26_sysmon.sql -# loading sql script: 27_rejects.sql -# loading sql script: 39_analytics.sql -# loading sql script: 39_analytics_hge.sql -# loading sql script: 40_geom.sql -# loading sql script: 40_json.sql -# loading sql script: 40_json_hge.sql -# loading sql script: 41_md5sum.sql -# loading sql script: 45_uuid.sql -# loading sql script: 46_gsl.sql -# loading sql script: 51_sys_schema_extension.sql -# loading sql script: 72_fits.sql -# loading sql script: 74_netcdf.sql -# loading sql script: 75_storagemodel.sql -# loading sql script: 80_statistics.sql -# loading sql script: 80_udf.sql -# loading sql script: 80_udf_hge.sql -# loading sql script: 85_bam.sql -# loading sql script: 90_generator.sql -# loading sql script: 90_generator_hge.sql -# loading sql script: 99_system.sql - -# 17:09:16 > -# 17:09:16 > "/usr/bin/python2" "concurrent-queries.Bug-3848.SQL.py" "concurrent-queries.Bug-3848" -# 17:09:16 > - -#create table test3848 (col1 bigint, col2 varchar(1024)); -#copy 1000000 records into test3848 from stdin using delimiters ',', '\n', '"';0,"something old" -#1,"something old" -#2,"something old" -#3,"something old" -#4,"something old" -#5,"something old" -#6,"something old" -#7,"something old" -#8,"something old" -#9,"something old" -#10,"something old" -#11,"something old" -#12,"something old" -#13,"something old" -#14,"something old" -#15,"something old" -#16,"something old" -#17,"something old" -#18,"something old" -#19,"something old" -#20,"something old" -#21,"something old" -#22,"something old" -#23,"something old" -[ 1000000 ] -#drop table test3848; - -# 17:14:38 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list