Changeset: ce360710bf14 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce360710bf14
Modified Files:
sql/test/remote/Tests/creds.SQL.py
sql/test/remote/Tests/creds.stable.err
sql/test/remote/Tests/creds.stable.out
sql/test/remote/Tests/different_user.SQL.py
sql/test/remote/Tests/different_user.stable.err
sql/test/remote/Tests/different_user.stable.out
sql/test/remote/Tests/invalid_creds.SQL.py
sql/test/remote/Tests/invalid_creds.stable.err
sql/test/remote/Tests/invalid_creds.stable.out
Branch: mtest
Log Message:
Silenced remote tests
diffs (truncated from 426 to 300 lines):
diff --git a/sql/test/remote/Tests/creds.SQL.py
b/sql/test/remote/Tests/creds.SQL.py
--- a/sql/test/remote/Tests/creds.SQL.py
+++ b/sql/test/remote/Tests/creds.SQL.py
@@ -2,6 +2,7 @@ import os
import tempfile
import threading
import socket
+import sys
import pymonetdb
@@ -121,10 +122,12 @@ with tempfile.TemporaryDirectory() as tm
# Run the queries
c.execute("SELECT COUNT(*) FROM ratings0")
- print("{} rows in remote table".format(c.fetchall()[0][0]))
+ if c.fetchall()[0][0] != 1000:
+ sys.stderr.write("1000 rows in remote table expected")
c.execute("SELECT COUNT(*) FROM ratings")
- print("{} rows in merge table".format(c.fetchall()[0][0]))
+ if c.fetchall()[0][0] != 2000:
+ sys.stderr.write("2000 rows in merge table expected")
for wrec in workers:
wrec['proc'].communicate()
supervisorproc.communicate()
diff --git a/sql/test/remote/Tests/creds.stable.err
b/sql/test/remote/Tests/creds.stable.err
--- a/sql/test/remote/Tests/creds.stable.err
+++ b/sql/test/remote/Tests/creds.stable.err
@@ -5,80 +5,6 @@ stderr of test 'creds` in directory 'sql
# 16:41:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39959" "--set"
"mapi_usock=/var/tmp/mtest-22488/.s.monetdb.39959" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_remote"
"--set" "embedded_c=true"
# 16:41:16 >
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 39959
-# cmdline opt mapi_usock = /var/tmp/mtest-22488/.s.monetdb.39959
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_remote
-# cmdline opt embedded_c = true
-# cmdline opt gdk_debug = 553648138
-
-# 16:41:17 >
-# 16:41:17 > "/bin/python" "creds.SQL.py" "creds"
-# 16:41:17 >
-
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt monet_prompt =
-# cmdline opt mapi_port = 40133
-# cmdline opt mapi_usock = /var/tmp/mtest-22488/.s.monetdb.40133
-# cmdline opt gdk_dbpath = /tmp/tmphNPMP3/supervisor/supervisor
-# cmdline opt gdk_debug = 553648138
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt monet_prompt =
-# cmdline opt mapi_port = 36599
-# cmdline opt mapi_usock = /var/tmp/mtest-22488/.s.monetdb.36599
-# cmdline opt gdk_dbpath = /tmp/tmphNPMP3/worker_0/worker_0
-# cmdline opt gdk_debug = 553648138
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt monet_prompt =
-# cmdline opt mapi_port = 57109
-# cmdline opt mapi_usock = /var/tmp/mtest-22488/.s.monetdb.57109
-# cmdline opt gdk_dbpath = /tmp/tmphNPMP3/worker_1/worker_1
-# cmdline opt gdk_debug = 553648138
# 16:41:19 >
# 16:41:19 > "Done."
diff --git a/sql/test/remote/Tests/creds.stable.out
b/sql/test/remote/Tests/creds.stable.out
--- a/sql/test/remote/Tests/creds.stable.out
+++ b/sql/test/remote/Tests/creds.stable.out
@@ -5,26 +5,6 @@ stdout of test 'creds` in directory 'sql
# 16:41:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39959" "--set"
"mapi_usock=/var/tmp/mtest-22488/.s.monetdb.39959" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_remote"
"--set" "embedded_c=true"
# 16:41:16 >
-# MonetDB 5 server v11.30.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_remote', using 4 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.513 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://zarquon.zarniwoop.org:39959/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-22488/.s.monetdb.39959
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 16:41:17 >
-# 16:41:17 > "/bin/python" "creds.SQL.py" "creds"
-# 16:41:17 >
-
-1000 rows in remote table
-2000 rows in merge table
# 16:41:19 >
# 16:41:19 > "Done."
diff --git a/sql/test/remote/Tests/different_user.SQL.py
b/sql/test/remote/Tests/different_user.SQL.py
--- a/sql/test/remote/Tests/different_user.SQL.py
+++ b/sql/test/remote/Tests/different_user.SQL.py
@@ -127,17 +127,17 @@ with tempfile.TemporaryDirectory() as TM
# Run the queries
try:
c.execute("SELECT COUNT(*) FROM ratings0")
- print("{} rows in remote table".format(c.fetchall()[0][0]))
+ if c.fetchall()[0][0] != 1000:
+ sys.stderr.write("1000 rows in remote table expected")
except pymonetdb.OperationalError as e1:
- print("OperationalError:", file=sys.stderr)
- print("# " + e1.message, file=sys.stderr)
+ sys.stderr.write("OperationalError: " + str(e1))
try:
c.execute("SELECT COUNT(*) FROM ratings")
- print("{} rows in merge table".format(c.fetchall()[0][0]))
+ if c.fetchall()[0][0] != 2000:
+ sys.stderr.write("2000 rows in merge table expected")
except pymonetdb.OperationalError as e2:
- print("OperationalError:", file=sys.stderr)
- print("# " + e2.message, file=sys.stderr)
+ sys.stderr.write("OperationalError: " + str(e2))
for wrec in workers:
wrec['proc'].communicate()
supervisorproc.communicate()
diff --git a/sql/test/remote/Tests/different_user.stable.err
b/sql/test/remote/Tests/different_user.stable.err
--- a/sql/test/remote/Tests/different_user.stable.err
+++ b/sql/test/remote/Tests/different_user.stable.err
@@ -5,80 +5,6 @@ stderr of test 'different_user` in direc
# 12:34:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35657" "--set"
"mapi_usock=/var/tmp/mtest-17442/.s.monetdb.35657" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_remote"
"--set" "embedded_c=true"
# 12:34:18 >
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35657
-# cmdline opt mapi_usock = /var/tmp/mtest-17442/.s.monetdb.35657
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_remote
-# cmdline opt embedded_c = true
-# cmdline opt gdk_debug = 553648138
-
-# 12:34:18 >
-# 12:34:18 > "/bin/python" "different_user.SQL.py" "different_user"
-# 12:34:18 >
-
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt monet_prompt =
-# cmdline opt mapi_port = 58809
-# cmdline opt mapi_usock = /var/tmp/mtest-17442/.s.monetdb.58809
-# cmdline opt gdk_dbpath = /tmp/tmp2LPwKk/supervisor/supervisor
-# cmdline opt gdk_debug = 553648138
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt monet_prompt =
-# cmdline opt mapi_port = 60153
-# cmdline opt mapi_usock = /var/tmp/mtest-17442/.s.monetdb.60153
-# cmdline opt gdk_dbpath = /tmp/tmp2LPwKk/worker_0/worker_0
-# cmdline opt gdk_debug = 553648138
-# builtin opt gdk_dbpath =
/home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt monet_prompt =
-# cmdline opt mapi_port = 52257
-# cmdline opt mapi_usock = /var/tmp/mtest-17442/.s.monetdb.52257
-# cmdline opt gdk_dbpath = /tmp/tmp2LPwKk/worker_1/worker_1
-# cmdline opt gdk_debug = 553648138
# 12:34:21 >
# 12:34:21 > "Done."
diff --git a/sql/test/remote/Tests/different_user.stable.out
b/sql/test/remote/Tests/different_user.stable.out
--- a/sql/test/remote/Tests/different_user.stable.out
+++ b/sql/test/remote/Tests/different_user.stable.out
@@ -5,26 +5,6 @@ stdout of test 'different_user` in direc
# 12:34:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35657" "--set"
"mapi_usock=/var/tmp/mtest-17442/.s.monetdb.35657" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_test_remote"
"--set" "embedded_c=true"
# 12:34:18 >
-# MonetDB 5 server v11.30.0 (git id: 3b50461604 br: remote_auth)
-# This is an unreleased version
-# Serving database 'mTests_sql_test_remote', using 4 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.513 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://zarquon.zarniwoop.org:35657/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17442/.s.monetdb.35657
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 12:34:18 >
-# 12:34:18 > "/bin/python" "different_user.SQL.py" "different_user"
-# 12:34:18 >
-
-1000 rows in remote table
-2000 rows in merge table
# 12:34:21 >
# 12:34:21 > "Done."
diff --git a/sql/test/remote/Tests/invalid_creds.SQL.py
b/sql/test/remote/Tests/invalid_creds.SQL.py
--- a/sql/test/remote/Tests/invalid_creds.SQL.py
+++ b/sql/test/remote/Tests/invalid_creds.SQL.py
@@ -120,17 +120,17 @@ with tempfile.TemporaryDirectory() as TM
# Run the queries
try:
c.execute("SELECT COUNT(*) FROM ratings0")
- print("{} rows in remote table".format(c.fetchall()[0][0]))
+ sys.stderr.write("Exception expected")
except pymonetdb.OperationalError as e1:
- print("OperationalError:", file=sys.stderr)
- print("# " + e1.args[0], file=sys.stderr)
+ if "invalid credentials for user 'invaliduser'" not in str(e1):
+ sys.stderr.write("Exception: invalid credentials for user
'invaliduser' expected")
try:
c.execute("SELECT COUNT(*) FROM ratings")
- print("{} rows in merge table".format(c.fetchall()[0][0]))
+ sys.stderr.write("Exception expected")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
