Changeset: 66b220fa7109 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66b220fa7109
Modified Files:
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.err
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
sql/test/concurrent/Tests/simple_select.SQL.py
sql/test/concurrent/Tests/simple_select.stable.err
sql/test/concurrent/Tests/simple_select.stable.out
Branch: mtest
Log Message:
Silencing even more Python tests.
I'm starting to get dizzy
diffs (121 lines):
diff --git
a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
+++ b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
@@ -30,7 +30,8 @@ class Client(threading.Thread):
self.result = cursor.fetchall()
def output(self):
- print("(%d, %s)" % (self.client, self.result))
+ if self.result != [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,),
(9,), (0,)]:
+ sys.stderr.write('[(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,),
(9,), (0,)] expected')
def main():
C = []
diff --git
a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.err
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.err
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.err
+++ b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.err
@@ -6,10 +6,6 @@ stderr of test 'crash_on_concurrent_use.
# 11:36:09 >
-# 11:36:09 >
-# 11:36:09 > /usr/bin/python crash_on_concurrent_use.SF-1411926.SQL.py
crash_on_concurrent_use.SF-1411926
-# 11:36:09 >
-
# 11:36:09 >
# 11:36:09 > Done.
diff --git
a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
+++ b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
@@ -5,24 +5,6 @@ stdout of test 'crash_on_concurrent_use.
# 22:16:18 > mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=4 --set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=38349 --set
xrpc_port=48169 --set monet_prompt= --trace
"--dbname=mTests_src_test_concurrent" --set mal_listing=0 "--dbinit= include
sql;" ; echo ; echo Over..
# 22:16:18 >
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_test_concurrent', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:38349/
-# MonetDB/SQL module v2.25.0 loaded
-
-
-# 11:01:29 >
-# 11:01:29 > "/usr/bin/python" "crash_on_concurrent_use.SF-1411926.SQL.py"
"crash_on_concurrent_use.SF-1411926"
-# 11:01:29 >
-
-(0, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(1, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(2, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(3, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(4, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
# 11:01:30 >
# 11:01:30 > "Done."
diff --git a/sql/test/concurrent/Tests/simple_select.SQL.py
b/sql/test/concurrent/Tests/simple_select.SQL.py
--- a/sql/test/concurrent/Tests/simple_select.SQL.py
+++ b/sql/test/concurrent/Tests/simple_select.SQL.py
@@ -15,7 +15,8 @@ class Client(threading.Thread):
self.result = cursor.fetchall()
def output(self):
- print("(%d, %s)" % (self.client, self.result))
+ if self.result != [(1, 2)]:
+ sys.stderr.write('[(1, 2)] expected')
def main():
C = []
diff --git a/sql/test/concurrent/Tests/simple_select.stable.err
b/sql/test/concurrent/Tests/simple_select.stable.err
--- a/sql/test/concurrent/Tests/simple_select.stable.err
+++ b/sql/test/concurrent/Tests/simple_select.stable.err
@@ -6,11 +6,6 @@ stderr of test 'simple_select` in direct
# 11:26:01 >
-# 11:26:01 >
-# 11:26:01 > /usr/bin/python simple_select.SQL.py simple_select
-# 11:26:01 >
-
-
# 11:26:02 >
# 11:26:02 > Done.
# 11:26:02 >
diff --git a/sql/test/concurrent/Tests/simple_select.stable.out
b/sql/test/concurrent/Tests/simple_select.stable.out
--- a/sql/test/concurrent/Tests/simple_select.stable.out
+++ b/sql/test/concurrent/Tests/simple_select.stable.out
@@ -5,31 +5,8 @@ stdout of test 'simple_select` in direct
# 11:26:56 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=34064 --set
xrpc_port=46586 --set monet_prompt= --trace
"--dbname=mTests_src_test_concurrent" --set mal_listing=0 "--dbinit= include
sql;" ; echo ; echo Over..
# 11:26:56 >
-# MonetDB server v5.12.0, based on kernel v1.30.0
-# Serving database 'mTests_src_test_concurrent', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:34064/
-# MonetDB/SQL module v2.30.0 loaded
-
-#function user.main():void;
-# clients.quit();
-#end main;
-
-# 19:24:23 >
-# 19:24:23 > /ufs/fabian/scratch/programs/gentoo/usr/bin/python
simple_select.SQL.py simple_select
-# 19:24:23 >
+# 17:23:22 >
+# 17:23:22 > "Done."
+# 17:23:22 >
-(0, [(1, 2)])
-(1, [(1, 2)])
-(2, [(1, 2)])
-(3, [(1, 2)])
-(4, [(1, 2)])
-
-# 19:24:24 >
-# 19:24:24 > Done.
-# 19:24:24 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
