Changeset: fbdc54c18a90 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbdc54c18a90
Added Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
Removed Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
Modified Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
Branch: default
Log Message:
Check OS before matching against the output file
diffs (truncated from 310 to 300 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.SQL.py
@@ -0,0 +1,15 @@
+from MonetDBtesting.sqltest import SQLTestCase
+import platform
+
+if platform.system() == 'Windows':
+ suffix = '.Windows'
+else:
+ suffix = ''
+
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ with open('copy_multiple_files.SF-2902320.sql') as f:
+ tc.execute(query=None, client='mclient', stdin=f)\
+
.assertMatchStableOut(fout='copy_multiple_files.SF-2902320.stable.out%s' %
(suffix))\
+
.assertMatchStableError(ferr='copy_multiple_files.SF-2902320.stable.err%s' %
(suffix))
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
@@ -1,80 +1,3 @@
-stderr of test 'copy_multiple_files.SF-2902320` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 08:59:53 >
-# 08:59:53 > 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=36694 --set
xrpc_port=47294 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 08:59:53 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.34.0
-# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# 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_alloc_map = yes
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# 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 standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# 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 =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_autosense = false
-# config opt mapi_open = false
-# config opt sql_optimizer = default_pipe
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt 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
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 36694
-# cmdline opt xrpc_port = 47294
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
-
-# 08:59:53 >
-# 08:59:53 > mclient -lsql -i --host=alf --port=36694
-# 08:59:53 >
-
MAPI = (monetdb) /var/tmp/mtest-20069/.s.monetdb.34504
QUERY = plan copy into cm_tmp from E'\\file1',E'\\file2';
ERROR = !COPY INTO: filename must have absolute path: "\\file1"
@@ -83,8 +6,3 @@ MAPI = (monetdb) /var/tmp/mtest-20069/.
QUERY = plan copy into cm_tmp from E'a:\\file1','Z:/file2';
ERROR = !COPY INTO: filename must have absolute path: "a:\\file1"
CODE = 42000
-
-# 08:59:53 >
-# 08:59:53 > Done.
-# 08:59:53 >
-
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
@@ -1,86 +1,4 @@
-stderr of test 'copy_multiple_files.SF-2902320` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 08:59:53 >
-# 08:59:53 > 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=36694 --set
xrpc_port=47294 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 08:59:53 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.34.0
-# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# 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_alloc_map = yes
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# 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 standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
-# 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 =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_autosense = false
-# config opt mapi_open = false
-# config opt sql_optimizer = default_pipe
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt 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
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 36694
-# cmdline opt xrpc_port = 47294
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
-
-# 08:59:53 >
-# 08:59:53 > mclient -lsql -i --host=alf --port=36694
-# 08:59:53 >
-
MAPI = (monetdb) /var/tmp/mtest-10609/.s.monetdb.34310
QUERY = plan copy into cm_tmp from '/file1','/file2';
ERROR = !COPY INTO: filename must have absolute path: "/file1"
CODE = 42000
-
-# 08:59:53 >
-# 08:59:53 > Done.
-# 08:59:53 >
-
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
@@ -1,25 +1,3 @@
-stdout of test 'copy_multiple_files.SF-2902320` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 08:59:53 >
-# 08:59:53 > 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=36694 --set
xrpc_port=47294 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 08:59:53 >
-
-# MonetDB server v5.16.0, based on kernel v1.34.0
-# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Detected 7.753 GiB (8324386816 bytes) main-memory.
-# 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:36694/
-# MonetDB/SQL module v2.34.0 loaded
-
-
-# 08:59:53 >
-# 08:59:53 > mclient -lsql -i --host=alf --port=36694
-# 08:59:53 >
-
% .plan # table_name
% rel # name
% clob # type
@@ -33,8 +11,3 @@ insert(
| | ) [ "cm_tmp"."i" ] COUNT
| ) [ int "NULL" ]
)
-
-# 08:59:53 >
-# 08:59:53 > Done.
-# 08:59:53 >
-
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
@@ -1,25 +1,3 @@
-stdout of test 'copy_multiple_files.SF-2902320` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 08:59:53 >
-# 08:59:53 > 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=36694 --set
xrpc_port=47294 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 08:59:53 >
-
-# MonetDB server v5.16.0, based on kernel v1.34.0
-# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Detected 7.753 GiB (8324386816 bytes) main-memory.
-# 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:36694/
-# MonetDB/SQL module v2.34.0 loaded
-
-
-# 08:59:53 >
-# 08:59:53 > mclient -lsql -i --host=alf --port=36694
-# 08:59:53 >
-
#create table cm_tmp(i int);
#plan copy into cm_tmp from E'\\file1',E'\\file2';
% .plan # table_name
@@ -49,8 +27,3 @@ insert(
| | ) [ "cm_tmp"."i" ] COUNT
| ) [ int "NULL" ]
)
-
-# 08:59:53 >
-# 08:59:53 > Done.
-# 08:59:53 >
-
diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
+++ /dev/null
@@ -1,26 +0,0 @@
-statement ok
-create table cm_tmp(i int)
-
-query T nosort
-PLAN copy into cm_tmp from '/file1','/file2'
-----
-insert(
-| table(sys.cm_tmp) [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ] COUNT
-| union (
-| | table (sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file1", bigint "-1", bigint "0", int "0", int
"0", varchar "NULL", int "0", int "1"),
-| | ) [ "cm_tmp"."i" ] COUNT ,
-| | table (sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file2", bigint "-1", bigint "0", int "0", int
"0", varchar "NULL", int "0", int "1"),
-| | ) [ "cm_tmp"."i" ] COUNT
-| ) [ int "NULL" ]
-)
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
