Changeset: 117b113f8247 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=117b113f8247
Modified Files:
sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.out
Branch: mtest
Log Message:
Silenced one more Python test
diffs (160 lines):
diff --git a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
--- a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
+++ b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
@@ -1,20 +1,23 @@
-import os, sys
+import sys
try:
from MonetDBtesting import process
except ImportError:
import process
-with process.client('sql',
- stdin=open(os.path.join(os.getenv('TSTSRCDIR'),
- os.path.pardir,
- 'insert-null-byte.sql')),
- stdout=process.PIPE, stderr=process.PIPE) as c:
- out, err = c.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
+with process.client('sql', text=False, stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE) as c:
+ out, err = c.communicate(b"\x00")
+ retcode = c.returncode
+
+ if retcode == 0:
+ sys.stderr.write("Expected nonzero return code")
+ if not err or b'NULL byte in input on line 1 of input' not in err:
+ sys.stderr.write('Expected error: NULL byte in input on line 1 of
input')
-with process.client('sql', stdin=process.PIPE,
- stdout=process.PIPE, stderr=process.PIPE) as c:
+with process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
out, err = c.communicate('drop table strings2233581;')
- sys.stdout.write(out)
- sys.stderr.write(err)
+ retcode = c.returncode
+
+ if retcode == 0:
+ sys.stderr.write("Expected nonzero return code")
+ if not err or 'DROP TABLE: no such table \'strings2233581\'' not in
str(err):
+ sys.stderr.write('Expected error: DROP TABLE: no such table
\'strings2233581\'')
diff --git
a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
--- a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
+++ b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
@@ -5,88 +5,6 @@ stderr of test 'insert-null-byte.SF-2233
# 17:08:25 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set
"sql_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/sql_logs"
--set
"xquery_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=34343 --set
xrpc_port=49456 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2008" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
# 17:08:25 >
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.26.3
-# builtin opt monet_pid = 22279
-# builtin opt prefix = /ufs/sjoerd/Monet-virgin-stable
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB:${prefix}/lib64/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 58
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_debug = 0
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${prefix}/lib64/MonetDB5/sql_init.sql
-# cmdline opt config = /ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm
-# cmdline opt sql_logdir =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/sql_logs
-# cmdline opt xquery_logdir =
/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/xquery_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 34343
-# cmdline opt xrpc_port = 49456
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2008
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf)
-
-# 17:08:26 >
-# 17:08:26 > ./insert-null-byte.SF-2233581.SQL.sh insert-null-byte.SF-2233581
-# 17:08:26 >
-
-NULL byte in input on line 4 of input
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = 3 "some other string"
-ERROR = !syntax error, unexpected sqlINT in: "3"
-CODE = 42000
-
# 17:08:26 >
# 17:08:26 > Done.
diff --git
a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.out
b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.out
--- a/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.out
+++ b/sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.out
@@ -5,24 +5,6 @@ stdout of test 'insert-null-byte.SF-2233
# 17:08:25 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/src/backends/monet5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/dbfarm"
--set
"sql_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/sql_logs"
--set
"xquery_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/sql/x86_64-unknown-linux-gnu/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=34343 --set
xrpc_port=49456 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2008" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
# 17:08:25 >
-# MonetDB server v5.8.3, based on kernel v1.26.3
-# Serving database 'mTests_src_test_BugTracker-2008', 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- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:34343/
-# MonetDB/SQL module v2.26.3 loaded
-
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 17:08:26 >
-# 17:08:26 > ./insert-null-byte.SF-2233581.SQL.sh insert-null-byte.SF-2233581
-# 17:08:26 >
-
# 17:08:26 >
# 17:08:26 > Done.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
