Changeset: fccdb098e76f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fccdb098e76f
Removed Files:
clients/Tests/mclient-uri.stable.err
clients/Tests/mclient-uri.stable.out
clients/Tests/mclient-uri.stable.out.Windows
Modified Files:
clients/Tests/mclient-uri.SQL.py
Branch: default
Log Message:
Also test Unix domain socket URI, but not on Windows.
diffs (161 lines):
diff --git a/clients/Tests/mclient-uri.SQL.py b/clients/Tests/mclient-uri.SQL.py
--- a/clients/Tests/mclient-uri.SQL.py
+++ b/clients/Tests/mclient-uri.SQL.py
@@ -8,3 +8,12 @@ if out != '1\n':
print(out)
if err:
print(err, file=sys.stderr)
+
+if os.name != 'nt':
+ with process.client('sql',
dbname='mapi:monetdb://{}/.s.monetdb.{}?database={}&language=sql&user=monetdb'.format(os.getenv('MAPIHOST',
'/tmp'), os.getenv('MAPIPORT', 50000), os.getenv('TSTDB', 'demo')), host='',
port='', format='csv', echo=False, stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
+ out, err = c.communicate('select 1;\n')
+
+ if out != '1\n':
+ print(out)
+ if err:
+ print(err, file=sys.stderr)
diff --git a/clients/Tests/mclient-uri.stable.err
b/clients/Tests/mclient-uri.stable.err
deleted file mode 100644
--- a/clients/Tests/mclient-uri.stable.err
+++ /dev/null
@@ -1,44 +0,0 @@
-stderr of test 'mclient-uri` in directory 'clients` itself:
-
-
-# 10:30:50 >
-# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36840" "--set"
"mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt="
"--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients"
-# 10:30:50 >
-
-# builtin opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/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 = 36840
-# cmdline opt mapi_usock = /var/tmp/mtest-2769/.s.monetdb.36840
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients
-# cmdline opt gdk_debug = 536870922
-
-# 10:30:51 >
-# 10:30:51 > "./mclient-uri.SQL.sh" "mclient-uri"
-# 10:30:51 >
-
-
-# 10:30:51 >
-# 10:30:51 > mclient -d
mapi:monetdb://madrid:36840/mTests_clients?language=sql&user=monetdb -f test -E
utf-8 -s select 1
-# 10:30:51 >
-
-
-# 10:30:51 >
-# 10:30:51 > mclient -d
mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840?database=mTests_clients&language=sql&user=monetdb
-f test -E utf-8 -s select 1
-# 10:30:51 >
-
-
-# 10:30:51 >
-# 10:30:51 > "Done."
-# 10:30:51 >
-
diff --git a/clients/Tests/mclient-uri.stable.out
b/clients/Tests/mclient-uri.stable.out
deleted file mode 100644
--- a/clients/Tests/mclient-uri.stable.out
+++ /dev/null
@@ -1,50 +0,0 @@
-stdout of test 'mclient-uri` in directory 'clients` itself:
-
-
-# 10:30:50 >
-# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36840" "--set"
"mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt="
"--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients"
-# 10:30:50 >
-
-# MonetDB 5 server v11.25.22 (hg id: 7b4a32dfbcc5+)
-# This is an unreleased version
-# Serving database 'mTests_clients', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
-# Found 15.589 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:36840/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 10:30:51 >
-# 10:30:51 > "./mclient-uri.SQL.sh" "mclient-uri"
-# 10:30:51 >
-
-
-# 13:05:14 >
-# 13:05:14 > mclient -d
mapi:monetdb://xps13:35757/mTests_clients?language=sql&user=monetdb -f test -t
none -E utf-8 -s select 1
-# 13:05:14 >
-
-% .%2 # table_name
-% %2 # name
-% tinyint # type
-% 1 # length
-[ 1 ]
-
-# 10:30:51 >
-# 10:30:51 > mclient -d
mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840?database=mTests_clients&language=sql&user=monetdb
-f test -E utf-8 -s select 1
-# 10:30:51 >
-
-% .%2 # table_name
-% %2 # name
-% tinyint # type
-% 1 # length
-[ 1 ]
-
-# 10:30:51 >
-# 10:30:51 > "Done."
-# 10:30:51 >
-
diff --git a/clients/Tests/mclient-uri.stable.out.Windows
b/clients/Tests/mclient-uri.stable.out.Windows
deleted file mode 100644
--- a/clients/Tests/mclient-uri.stable.out.Windows
+++ /dev/null
@@ -1,36 +0,0 @@
-stdout of test 'mclient-uri` in directory 'clients` itself:
-
-
-# 10:30:50 >
-# 10:30:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36840" "--set"
"mapi_usock=/var/tmp/mtest-2769/.s.monetdb.36840" "--set" "monet_prompt="
"--forcemito" "--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_clients"
-# 10:30:50 >
-
-# MonetDB 5 server v11.25.22 (hg id: 7b4a32dfbcc5+)
-# This is an unreleased version
-# Serving database 'mTests_clients', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
-# Found 15.589 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:36840/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-2769/.s.monetdb.36840
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-
-# 13:05:14 >
-# 13:05:14 > mclient -d
mapi:monetdb://xps13:35757/mTests_clients?language=sql&user=monetdb -f test -t
none -E utf-8 -s select 1
-# 13:05:14 >
-
-% .%2 # table_name
-% %2 # name
-% tinyint # type
-% 1 # length
-[ 1 ]
-
-# 10:30:51 >
-# 10:30:51 > "Done."
-# 10:30:51 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
