Changeset: fe3d3abf3fd3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe3d3abf3fd3 Added Files: monetdb5/tools/Tests/mserver5-ipv6.py monetdb5/tools/Tests/mserver5-ipv6.stable.err monetdb5/tools/Tests/mserver5-ipv6.stable.out Modified Files: monetdb5/tools/Tests/All testing/process.py Branch: ipv6 Log Message:
Added optional ipv6 flag to server process in Mtest. diffs (134 lines): diff --git a/monetdb5/tools/Tests/All b/monetdb5/tools/Tests/All --- a/monetdb5/tools/Tests/All +++ b/monetdb5/tools/Tests/All @@ -1,3 +1,3 @@ mserver5--help - mclient-t-s +mserver5-ipv6 diff --git a/monetdb5/tools/Tests/mserver5-ipv6.py b/monetdb5/tools/Tests/mserver5-ipv6.py new file mode 100644 --- /dev/null +++ b/monetdb5/tools/Tests/mserver5-ipv6.py @@ -0,0 +1,21 @@ +import sys +try: + from MonetDBtesting import process +except ImportError: + import process + +server = process.server(stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE, ipv6=True) +client = process.client('sql', host='::1', server=server, stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE) +cout, cerr = client.communicate(''' +start transaction; +create table "things" ("col1" int); +insert into "things" values (1); select "col1" from "things"; +rollback; +''') + +sout, serr = server.communicate() +sys.stdout.write(sout) +sys.stderr.write(serr) + +sys.stdout.write(cout) +sys.stderr.write(cerr) diff --git a/monetdb5/tools/Tests/mserver5-ipv6.stable.err b/monetdb5/tools/Tests/mserver5-ipv6.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/tools/Tests/mserver5-ipv6.stable.err @@ -0,0 +1,28 @@ +stderr of test 'mserver5-ipv6` in directory 'monetdb5/tools` itself: + + +# 16:46:06 > +# 16:46:06 > "/usr/bin/python2" "mserver5-ipv6.py" "mserver5-ipv6" +# 16:46:06 > + +# builtin opt gdk_dbpath = /home/ferreira/repositories/MonetDB-ipv6/BUILD/var/monetdb5/dbfarm/demo +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = 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 = 30569 +# cmdline opt mapi_usock = /var/tmp/mtest-27181/.s.monetdb.30569 +# cmdline opt monet_prompt = +# cmdline opt mapi_ipv6 = true +# cmdline opt gdk_dbpath = /home/ferreira/repositories/MonetDB-ipv6/BUILD/var/MonetDB/mTests_monetdb5_tools + +# 16:46:06 > +# 16:46:06 > "Done." +# 16:46:06 > + diff --git a/monetdb5/tools/Tests/mserver5-ipv6.stable.out b/monetdb5/tools/Tests/mserver5-ipv6.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/tools/Tests/mserver5-ipv6.stable.out @@ -0,0 +1,35 @@ +stdout of test 'mserver5-ipv6` in directory 'monetdb5/tools` itself: + + +# 16:46:06 > +# 16:46:06 > "/usr/bin/python2" "mserver5-ipv6.py" "mserver5-ipv6" +# 16:46:06 > + +# MonetDB 5 server v11.34.0 (hg id: 400cb105fa55+) +# This is an unreleased version +# Serving database 'mTests_monetdb5_tools', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.527 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.localdomain:30569/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27181/.s.monetdb.30569 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +#start transaction; +#create table "things" ("col1" int); +#insert into "things" values (1); select "col1" from "things"; +[ 1 ] +#insert into "things" values (1); select "col1" from "things"; +% sys.things # table_name +% col1 # name +% int # type +% 1 # length +[ 1 ] +#rollback; + +# 16:46:06 > +# 16:46:06 > "Done." +# 16:46:06 > + diff --git a/testing/process.py b/testing/process.py --- a/testing/process.py +++ b/testing/process.py @@ -354,7 +354,7 @@ def client(lang, args=[], stdin=None, st def server(args=[], stdin=None, stdout=None, stderr=None, mapiport=None, dbname=os.getenv('TSTDB'), dbfarm=None, dbextra=None, bufsize=0, log=False, - notrace=False, notimeout=False): + notrace=False, notimeout=False, ipv6=False): '''Start a server process.''' cmd = _server[:] if not cmd: @@ -366,6 +366,14 @@ def server(args=[], stdin=None, stdout=N sys.stdout.write('Default server: ' + ' '.join(cmd + args) + '\n') if notrace and '--trace' in cmd: cmd.remove('--trace') + if ipv6: + for i in range(len(cmd)): + if cmd[i].startswith('mapi_ipv6='): + del cmd[i] + del cmd[i - 1] + break + cmd.append('--set') + cmd.append('mapi_ipv6=true') if mapiport is not None: # make sure it's a string mapiport = str(int(mapiport)) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list