Changeset: a8c2b8675859 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a8c2b8675859
Added Files:
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out.int128
Modified Files:
common/stream/Tests/All
common/stream/Tests/read_bz2.py
common/stream/Tests/read_gz.py
common/stream/Tests/read_iconv.py
common/stream/Tests/read_lz4.py
common/stream/Tests/read_uncompressed.py
common/stream/Tests/read_xz.py
common/stream/Tests/write_bz2.py
common/stream/Tests/write_gz.py
common/stream/Tests/write_iconv.py
common/stream/Tests/write_lz4.py
common/stream/Tests/write_uncompressed.py
common/stream/Tests/write_xz.py
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out
Branch: Oct2020
Log Message:
Fix a bunch of tests.
diffs (truncated from 353 to 300 lines):
diff --git a/common/stream/Tests/All b/common/stream/Tests/All
--- a/common/stream/Tests/All
+++ b/common/stream/Tests/All
@@ -10,7 +10,7 @@ HAVE_LIBZ?write_gz
HAVE_LIBLZ4&HAVE_PYTHON_LZ4?write_lz4
HAVE_LIBLZMA?write_xz
-urlstream
+HAVE_CURL?urlstream
read_iconv
write_iconv
diff --git a/common/stream/Tests/read_bz2.py b/common/stream/Tests/read_bz2.py
--- a/common/stream/Tests/read_bz2.py
+++ b/common/stream/Tests/read_bz2.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import read_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/read_gz.py b/common/stream/Tests/read_gz.py
--- a/common/stream/Tests/read_gz.py
+++ b/common/stream/Tests/read_gz.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import read_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/read_iconv.py
b/common/stream/Tests/read_iconv.py
--- a/common/stream/Tests/read_iconv.py
+++ b/common/stream/Tests/read_iconv.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
from testdata import Doc, TestFile
-import os
import subprocess
-import sys
def run_streamcat(text, enc, expected_error = None):
@@ -20,7 +20,10 @@ def run_streamcat(text, enc, expected_er
cmd = ['streamcat', 'read', filename, 'rstream', f'iconv:{enc}']
print(f"Input is {repr(content)}")
proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ if proc.stdout:
+ proc.stdout = proc.stdout.replace(b'\r', b'')
if proc.stderr:
+ proc.stderr = proc.stderr.replace(b'\r', b'')
sys.stderr.buffer.write(proc.stderr)
sys.stderr.flush()
if expected_error == None:
@@ -49,4 +52,3 @@ run_streamcat(text, 'latin1')
# invalid utf-8, expect an error
run_streamcat(b"M\xc3\xc3NETDB", 'utf-8', b'multibyte sequence')
-
diff --git a/common/stream/Tests/read_lz4.py b/common/stream/Tests/read_lz4.py
--- a/common/stream/Tests/read_lz4.py
+++ b/common/stream/Tests/read_lz4.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import read_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/read_uncompressed.py
b/common/stream/Tests/read_uncompressed.py
--- a/common/stream/Tests/read_uncompressed.py
+++ b/common/stream/Tests/read_uncompressed.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import read_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/read_xz.py b/common/stream/Tests/read_xz.py
--- a/common/stream/Tests/read_xz.py
+++ b/common/stream/Tests/read_xz.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import read_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/write_bz2.py b/common/stream/Tests/write_bz2.py
--- a/common/stream/Tests/write_bz2.py
+++ b/common/stream/Tests/write_bz2.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import write_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/write_gz.py b/common/stream/Tests/write_gz.py
--- a/common/stream/Tests/write_gz.py
+++ b/common/stream/Tests/write_gz.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import write_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/write_iconv.py
b/common/stream/Tests/write_iconv.py
--- a/common/stream/Tests/write_iconv.py
+++ b/common/stream/Tests/write_iconv.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
from testdata import Doc, TestFile
-import os
import subprocess
-import sys
import tempfile
diff --git a/common/stream/Tests/write_lz4.py b/common/stream/Tests/write_lz4.py
--- a/common/stream/Tests/write_lz4.py
+++ b/common/stream/Tests/write_lz4.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import write_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/write_uncompressed.py
b/common/stream/Tests/write_uncompressed.py
--- a/common/stream/Tests/write_uncompressed.py
+++ b/common/stream/Tests/write_uncompressed.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import write_tests
-import sys
def filter(f):
diff --git a/common/stream/Tests/write_xz.py b/common/stream/Tests/write_xz.py
--- a/common/stream/Tests/write_xz.py
+++ b/common/stream/Tests/write_xz.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import sys, os
+sys.path.append(os.environ.get('TSTSRCDIR','.'))
import write_tests
-import sys
def filter(f):
diff --git a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
@@ -1,3 +1,3 @@
select 'a'+1;
select 1-'a';
-select cast(true+1 as bigint);
+select true+1;
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
@@ -81,11 +81,11 @@ stderr of test 'mixed_type.SF-917372` in
MAPI = (monetdb) /var/tmp/mtest-10022/.s.monetdb.31381
QUERY = select 'a'+1;
-ERROR = !conversion of string 'a' to type hge failed.
+ERROR = !conversion of string 'a' to type lng failed.
CODE = 22018
MAPI = (monetdb) /var/tmp/mtest-2179869/.s.monetdb.37655
QUERY = select 1-'a';
-ERROR = !conversion of string 'a' to type hge failed.
+ERROR = !conversion of string 'a' to type lng failed.
CODE = 22018
# 19:21:06 >
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
@@ -0,0 +1,94 @@
+stderr of test 'mixed_type.SF-917372` in directory
'sql/test/BugDay_2005-10-06_2.8` itself:
+
+
+# 19:21:06 >
+# 19:21:06 > 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=33392 --set
xrpc_port=40415 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugDay_2005-10-06_2.8" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 19:21:06 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.27.0
+# builtin opt monet_pid = 25524
+# builtin opt prefix = /ufs/niels/scratch/monetdb/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_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 =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/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/niels/scratch/monetdb/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/monetdb/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/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 = ${exec_prefix}/lib/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
+# config opt mapi_port = 50000
+# config opt mapi_open = false
+# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
+# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
+# cmdline opt config =
/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 4
+# cmdline opt 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
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt sql_logdir =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 33392
+# cmdline opt xrpc_port = 40415
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbname = mTests_src_test_BugDay_2005-10-06_2.8
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 10
+#warning: please don't forget to set your vault key!
+#(see /ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf)
+
+# 19:21:06 >
+# 19:21:06 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33392
+# 19:21:06 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
