Changeset: 672cfa260d9e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=672cfa260d9e
Removed Files:
sql/test/BugTracker/Tests/auto_commit.SF-1724151.txt
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.sql
Modified Files:
sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.err
sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.out
sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
sql/test/BugTracker/Tests/connect_crash.SF-1436626.stable.out
sql/test/BugTracker/Tests/local_temp_table.SF-1865953.stable.err
sql/test/BugTracker/Tests/local_temp_table.SF-1865953.stable.out
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.stable.out
Branch: mtest
Log Message:
Silenced Python tests
diffs (truncated from 807 to 300 lines):
diff --git a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
--- a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
+++ b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
@@ -1,13 +1,32 @@
-import os, sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ tc.connect(username="monetdb", password="monetdb")
+ tc.execute("""
+ create table tbl_xy (x int, y int);
+ insert into tbl_xy values (0,0);
+ insert into tbl_xy values (1,1);
+ """).assertSucceeded()
+
+ tc.execute("""
+ insert into tbl_xy values (2,2);
+ insert into tbl_xy values (3,3);
+ insert into tbl_xy values (4,4);
+ """).assertSucceeded()
-with process.client('sql',
- args = [os.path.join(os.getenv('TSTSRCDIR'),
- '%s.txt' % sys.argv[1])],
- stdout = process.PIPE, stderr = process.PIPE) as c:
- out, err = c.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
+ tc.execute("""
+ insert into tbl_xy values (5,5);
+ insert into tbl_xy values (6,6);
+ insert into tbl_xy values (7,7);
+ """).assertSucceeded()
+
+ tc.execute("insert into tbl_xy values (-1,
-100);").assertSucceeded().assertRowCount(1)
+
+ tc.execute("""
+ insert into tbl_xy values (8,8);
+ insert into tbl_xy values (9,9);
+ insert into tbl_xy values (10,10);
+ """).assertSucceeded()
+
+ tc.execute("select * from
tbl_xy;").assertSucceeded().assertRowCount(12).assertDataResultMatch([(0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(-1,-100),(8,8),(9,9),(10,10)])
+ tc.execute("drop table tbl_xy;").assertSucceeded()
diff --git a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.err
b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.err
--- a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.err
+++ b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.err
@@ -7,11 +7,6 @@ stderr of test 'auto_commit.SF-1724151`
# 13:54:46 >
-# 13:54:46 > Mtimeout -timeout 120 /usr/bin/python
auto_commit.SF-1724151.SQL.py auto_commit.SF-1724151
-# 13:54:46 >
-
-
-# 13:54:46 >
# 13:54:46 > Done.
# 13:54:46 >
diff --git a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.out
b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.out
--- a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.out
+++ b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.stable.out
@@ -1,402 +1,12 @@
stdout of test 'auto_commit.SF-1724151` in directory 'sql/test/BugTracker`
itself:
-# 13:54:45 >
-# 13:54:45 > Mtimeout -timeout 240 Mserver
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=31445 --set xrpc_port=44465 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker" --dbinit=" module(sql_server);" ; echo ;
echo Over..
-# 13:54:45 >
-
-# Monet Database Server V4.17.1
-# Copyright (c) 1993-2007, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
-
-
+# 13:12:51 >
+# 13:12:51 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-267685" "--port=36116"
+# 13:12:51 >
-# 13:54:46 >
-# 13:54:46 > Mtimeout -timeout 120 /usr/bin/python
auto_commit.SF-1724151.SQL.py auto_commit.SF-1724151
-# 13:54:46 >
+# 13:12:51 >
+# 13:12:51 > "Done."
+# 13:12:51 >
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
-#create table tbl_xy (x int , y int);
-#insert into tbl_xy values (0,0);
-#insert into tbl_xy values (1,1);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (2,2);
-#insert into tbl_xy values (3,3);
-#insert into tbl_xy values (4,4);
-#commit;
-#
-#start transaction;
-#insert into tbl_xy values (5,5);
-#insert into tbl_xy values (6,6);
-#insert into tbl_xy values (7,7);
-#commit;
-#
-#
-#insert into tbl_xy values (-1, -100);
-#
-#
-#start transaction;
-#insert into tbl_xy values (8,8);
-#insert into tbl_xy values (9,9);
-[ 1 ]
-#start transaction;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
