Update of /cvsroot/monetdb/pathfinder/tests/BugTracker/Tests
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2429
Modified Files:
Tag: XQuery_0-16
call2builtin_function_crashes_XRPC_client.SF-1655857.xq.in
conflict_normal_xrpc_queries_nx.SF-1644610_s01.xq.in
conflict_normal_xrpc_queries_xn.SF-1644610_s00.xq.in
Removed Files:
Tag: XQuery_0-16
call2builtin_function_crashes_XRPC_client.SF-1655857.prologue.src
call2builtin_function_crashes_XRPC_client.SF-1655857.rpcd_start.mil
conflict_normal_xrpc_queries.SF-1644610.rpcd_start.mil
conflict_normal_xrpc_queries_nx.SF-1644610.prologue.src
conflict_normal_xrpc_queries_xn.SF-1644610.prologue.src
Log Message:
made XRpc tests work, again:
Not only has "xquery_httpd_port" been renamed into "xrpc_port",
but also the defaults have changed:
While the former used to default to 48080 on the server side (via MonetDB.conf)
and on the client side (hard-wired in the code),
the latter now defaults to "" (not set) in MonetDB.conf, and hence to
mapi_port+1 in the server code; in the client code, the default is still
hard-wired to 48080.
Hence, to make the XRPC tests work, again, in the Mtest enviroment
(which dynamically sets mapi_port randomly to avoid conflict between
concurrent Mtest runs and/or with other programs that happen to use
the default port(s)), we need to also set xrpc_port dynamically (now
done by Mtest), and use the dynamically set xrpc_port (via $XRPCPORT)
in the respective tests.
Moreover, when module pathfinder is loaded, it now autimatically starts
an xrpc-server; hence, we must not try to start a second xrpc-server in
the XRPC tests.
To make this work properly, you also need to cvs-update & make-install
MonetDB to get the latest version of Mtest.py .
--- call2builtin_function_crashes_XRPC_client.SF-1655857.prologue.src DELETED
---
Index: conflict_normal_xrpc_queries_nx.SF-1644610_s01.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/conflict_normal_xrpc_queries_nx.SF-1644610_s01.xq.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- conflict_normal_xrpc_queries_nx.SF-1644610_s01.xq.in 8 Feb 2007
18:15:29 -0000 1.1.2.1
+++ conflict_normal_xrpc_queries_nx.SF-1644610_s01.xq.in 14 Feb 2007
22:00:33 -0000 1.1.2.2
@@ -1,4 +1,4 @@
import module namespace test = "bugtracker-function"
at "$TSTSRCDIR/conflict_normal_xrpc_queries.SF-1644610.module.xq";
-test:add("localhost", 13, 14)
+test:add("localhost:$XRPCPORT", 13, 14)
Index: call2builtin_function_crashes_XRPC_client.SF-1655857.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/call2builtin_function_crashes_XRPC_client.SF-1655857.xq.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- call2builtin_function_crashes_XRPC_client.SF-1655857.xq.in 9 Feb 2007
10:33:58 -0000 1.1.2.1
+++ call2builtin_function_crashes_XRPC_client.SF-1655857.xq.in 14 Feb 2007
22:00:33 -0000 1.1.2.2
@@ -1,4 +1,4 @@
-execute at { "localhost" }
+execute at { "localhost:$XRPCPORT" }
{
pf:add-doc("$TSTSRCDIR/call2builtin_function_crashes_XRPC_client.SF-1655857.xml",
"hello.xml")
}
--- conflict_normal_xrpc_queries_xn.SF-1644610.prologue.src DELETED ---
--- call2builtin_function_crashes_XRPC_client.SF-1655857.rpcd_start.mil DELETED
---
--- conflict_normal_xrpc_queries.SF-1644610.rpcd_start.mil DELETED ---
Index: conflict_normal_xrpc_queries_xn.SF-1644610_s00.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugTracker/Tests/conflict_normal_xrpc_queries_xn.SF-1644610_s00.xq.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- conflict_normal_xrpc_queries_xn.SF-1644610_s00.xq.in 8 Feb 2007
18:15:29 -0000 1.1.2.1
+++ conflict_normal_xrpc_queries_xn.SF-1644610_s00.xq.in 14 Feb 2007
22:00:34 -0000 1.1.2.2
@@ -1,4 +1,4 @@
import module namespace test = "bugtracker-function"
at "$TSTSRCDIR/conflict_normal_xrpc_queries.SF-1644610.module.xq";
-test:add("localhost", 13, 14)
+test:add("localhost:$XRPCPORT", 13, 14)
--- conflict_normal_xrpc_queries_nx.SF-1644610.prologue.src DELETED ---
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
