Update of /cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32690/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests
Modified Files:
file_locked_after_shredding.SF-1238352.MIL.py
multiple_servers.SF-1385152.py
multiple_servers_2.SF-1385152.py
multiple_servers_2.SF-1385152.stable.err
multiple_servers_2.SF-1385152.stable.out
Log Message:
Introducing MAL client tests
<tst>[_s??].malC
and
<tst>.MAL.(sh|bat|cmd|exe|com|py)
analogously to the respective MIL client tests.
To avoid confusion/conflicts/ambiguity, variables
MAPICLIENT, MAPI_CLIENT, Mapi_CLient
have been renamed to
MILCLIENT, MIL_CLIENT, MIL_Client
and
MALCLIENT, MAL_CLIENT, MAL_Client
(we already had
SQLCLIENT, SQL_CLIENT, SQL_Client
XQUERYCLIENT, XQUERY_CLIENT, XQuery_Client
X100CLIENT, X100_CLIENT, X100_Client
)
Index: multiple_servers_2.SF-1385152.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.stable.out,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- multiple_servers_2.SF-1385152.stable.out 19 Apr 2007 14:21:34 -0000
1.6
+++ multiple_servers_2.SF-1385152.stable.out 30 Aug 2007 00:07:34 -0000
1.7
@@ -20,10 +20,10 @@
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>112</XQueryResult>
-server 11 : "module(pathfinder); mil_start();", client 3: (XQUERY) (XQUERY)
MAPI
+server 11 : "module(pathfinder); mil_start();", client 3: (XQUERY) (XQUERY) MIL
[ 113 ]
-server 11 : "module(pathfinder); mil_start();", client 4: (XQUERY) (XQUERY)
(MAPI) MAPI
+server 11 : "module(pathfinder); mil_start();", client 4: (XQUERY) (XQUERY)
(MIL) MIL
[ 114 ]
quit();
@@ -37,14 +37,14 @@
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>121</XQueryResult>
-server 12 : "module(pathfinder); mil_start();", client 2: (XQUERY) MAPI
+server 12 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
[ 122 ]
-server 12 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MAPI)
XQUERY
+server 12 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>123</XQueryResult>
-server 12 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MAPI)
(XQUERY) MAPI
+server 12 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL)
(XQUERY) MIL
[ 124 ]
quit();
@@ -54,18 +54,18 @@
# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
-server 13 : "module(pathfinder); mil_start();", client 1: MAPI
+server 13 : "module(pathfinder); mil_start();", client 1: MIL
[ 131 ]
-server 13 : "module(pathfinder); mil_start();", client 2: (MAPI) XQUERY
+server 13 : "module(pathfinder); mil_start();", client 2: (MIL) XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>132</XQueryResult>
-server 13 : "module(pathfinder); mil_start();", client 3: (MAPI) (XQUERY)
XQUERY
+server 13 : "module(pathfinder); mil_start();", client 3: (MIL) (XQUERY) XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>133</XQueryResult>
-server 13 : "module(pathfinder); mil_start();", client 4: (MAPI) (XQUERY)
(XQUERY) MAPI
+server 13 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY)
(XQUERY) MIL
[ 134 ]
quit();
@@ -79,13 +79,13 @@
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>141</XQueryResult>
-server 14 : "module(pathfinder); mil_start();", client 2: (XQUERY) MAPI
+server 14 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
[ 142 ]
-server 14 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MAPI) MAPI
+server 14 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) MIL
[ 143 ]
-server 14 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MAPI)
(MAPI) XQUERY
+server 14 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL) (MIL)
XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>144</XQueryResult>
quit();
@@ -96,17 +96,17 @@
# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
-server 15 : "module(pathfinder); mil_start();", client 1: MAPI
+server 15 : "module(pathfinder); mil_start();", client 1: MIL
[ 151 ]
-server 15 : "module(pathfinder); mil_start();", client 2: (MAPI) XQUERY
+server 15 : "module(pathfinder); mil_start();", client 2: (MIL) XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>152</XQueryResult>
-server 15 : "module(pathfinder); mil_start();", client 3: (MAPI) (XQUERY) MAPI
+server 15 : "module(pathfinder); mil_start();", client 3: (MIL) (XQUERY) MIL
[ 153 ]
-server 15 : "module(pathfinder); mil_start();", client 4: (MAPI) (XQUERY)
(MAPI) XQUERY
+server 15 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY) (MIL)
XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>154</XQueryResult>
quit();
@@ -117,17 +117,17 @@
# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
-server 16 : "module(pathfinder); mil_start();", client 1: MAPI
+server 16 : "module(pathfinder); mil_start();", client 1: MIL
[ 161 ]
-server 16 : "module(pathfinder); mil_start();", client 2: (MAPI) MAPI
+server 16 : "module(pathfinder); mil_start();", client 2: (MIL) MIL
[ 162 ]
-server 16 : "module(pathfinder); mil_start();", client 3: (MAPI) (MAPI) XQUERY
+server 16 : "module(pathfinder); mil_start();", client 3: (MIL) (MIL) XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>163</XQueryResult>
-server 16 : "module(pathfinder); mil_start();", client 4: (MAPI) (MAPI)
(XQUERY) XQUERY
+server 16 : "module(pathfinder); mil_start();", client 4: (MIL) (MIL) (XQUERY)
XQUERY
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>164</XQueryResult>
quit();
Index: multiple_servers_2.SF-1385152.stable.err
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.stable.err,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- multiple_servers_2.SF-1385152.stable.err 19 Apr 2007 14:21:34 -0000
1.5
+++ multiple_servers_2.SF-1385152.stable.err 30 Aug 2007 00:07:34 -0000
1.6
@@ -69,9 +69,9 @@
server 11 : "module(pathfinder); mil_start();", client 2: (XQUERY) XQUERY
-server 11 : "module(pathfinder); mil_start();", client 3: (XQUERY) (XQUERY)
MAPI
+server 11 : "module(pathfinder); mil_start();", client 3: (XQUERY) (XQUERY) MIL
-server 11 : "module(pathfinder); mil_start();", client 4: (XQUERY) (XQUERY)
(MAPI) MAPI
+server 11 : "module(pathfinder); mil_start();", client 4: (XQUERY) (XQUERY)
(MIL) MIL
server 12 : "module(pathfinder); mil_start();"
# builtin opt config = ${prefix}/etc/MonetDB.conf
@@ -134,11 +134,11 @@
server 12 : "module(pathfinder); mil_start();", client 1: XQUERY
-server 12 : "module(pathfinder); mil_start();", client 2: (XQUERY) MAPI
+server 12 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
-server 12 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MAPI)
XQUERY
+server 12 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) XQUERY
-server 12 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MAPI)
(XQUERY) MAPI
+server 12 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL)
(XQUERY) MIL
server 13 : "module(pathfinder); mil_start();"
# builtin opt config = ${prefix}/etc/MonetDB.conf
@@ -199,13 +199,13 @@
# cmdline opt xquery_port = 55609
# cmdline opt monet_prompt =
-server 13 : "module(pathfinder); mil_start();", client 1: MAPI
+server 13 : "module(pathfinder); mil_start();", client 1: MIL
-server 13 : "module(pathfinder); mil_start();", client 2: (MAPI) XQUERY
+server 13 : "module(pathfinder); mil_start();", client 2: (MIL) XQUERY
-server 13 : "module(pathfinder); mil_start();", client 3: (MAPI) (XQUERY)
XQUERY
+server 13 : "module(pathfinder); mil_start();", client 3: (MIL) (XQUERY) XQUERY
-server 13 : "module(pathfinder); mil_start();", client 4: (MAPI) (XQUERY)
(XQUERY) MAPI
+server 13 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY)
(XQUERY) MIL
server 14 : "module(pathfinder); mil_start();"
# builtin opt config = ${prefix}/etc/MonetDB.conf
@@ -268,11 +268,11 @@
server 14 : "module(pathfinder); mil_start();", client 1: XQUERY
-server 14 : "module(pathfinder); mil_start();", client 2: (XQUERY) MAPI
+server 14 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
-server 14 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MAPI) MAPI
+server 14 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) MIL
-server 14 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MAPI)
(MAPI) XQUERY
+server 14 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL) (MIL)
XQUERY
server 15 : "module(pathfinder); mil_start();"
# builtin opt config = ${prefix}/etc/MonetDB.conf
@@ -333,13 +333,13 @@
# cmdline opt xquery_port = 55609
# cmdline opt monet_prompt =
-server 15 : "module(pathfinder); mil_start();", client 1: MAPI
+server 15 : "module(pathfinder); mil_start();", client 1: MIL
-server 15 : "module(pathfinder); mil_start();", client 2: (MAPI) XQUERY
+server 15 : "module(pathfinder); mil_start();", client 2: (MIL) XQUERY
-server 15 : "module(pathfinder); mil_start();", client 3: (MAPI) (XQUERY) MAPI
+server 15 : "module(pathfinder); mil_start();", client 3: (MIL) (XQUERY) MIL
-server 15 : "module(pathfinder); mil_start();", client 4: (MAPI) (XQUERY)
(MAPI) XQUERY
+server 15 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY) (MIL)
XQUERY
server 16 : "module(pathfinder); mil_start();"
# builtin opt config = ${prefix}/etc/MonetDB.conf
@@ -400,13 +400,13 @@
# cmdline opt xquery_port = 55609
# cmdline opt monet_prompt =
-server 16 : "module(pathfinder); mil_start();", client 1: MAPI
+server 16 : "module(pathfinder); mil_start();", client 1: MIL
-server 16 : "module(pathfinder); mil_start();", client 2: (MAPI) MAPI
+server 16 : "module(pathfinder); mil_start();", client 2: (MIL) MIL
-server 16 : "module(pathfinder); mil_start();", client 3: (MAPI) (MAPI) XQUERY
+server 16 : "module(pathfinder); mil_start();", client 3: (MIL) (MIL) XQUERY
-server 16 : "module(pathfinder); mil_start();", client 4: (MAPI) (MAPI)
(XQUERY) XQUERY
+server 16 : "module(pathfinder); mil_start();", client 4: (MIL) (MIL) (XQUERY)
XQUERY
# 19:48:15 >
# 19:48:15 > Done.
Index: multiple_servers_2.SF-1385152.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- multiple_servers_2.SF-1385152.py 19 Apr 2007 14:21:34 -0000 1.6
+++ multiple_servers_2.SF-1385152.py 30 Aug 2007 00:07:34 -0000 1.7
@@ -30,41 +30,41 @@
c = 0 ; h = ''
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
c = 0 ; h = ''
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
c = 0 ; h = ''
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
c = 0 ; h = ''
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
c = 0 ; h = ''
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
c = 0 ; h = ''
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; h = client(x,s,c,dbinit,'MAPI' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c += 1; h = client(x,s,c,dbinit,'MIL' ,'print(%d%d%d);\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
c += 1; h = client(x,s,c,dbinit,'XQUERY', '%d%d%d\n' % (x,s,c),h)
server_stop(srv)
Index: file_locked_after_shredding.SF-1238352.MIL.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- file_locked_after_shredding.SF-1238352.MIL.py 29 Aug 2007 20:17:32
-0000 1.1
+++ file_locked_after_shredding.SF-1238352.MIL.py 30 Aug 2007 00:07:34
-0000 1.2
@@ -7,7 +7,7 @@
f.write('<testdoc><content/></testdoc>\n')
f.close()
# shred it
- p = os.popen(os.getenv('MAPI_CLIENT'), 'w')
+ p = os.popen(os.getenv('MIL_CLIENT'), 'w')
p.write('module("pathfinder");\n')
p.write('shred_doc("%s", "testdoc.xml");\n' % fn.replace('\\', r'\\'))
p.close()
Index: multiple_servers.SF-1385152.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- multiple_servers.SF-1385152.py 19 Apr 2007 14:21:34 -0000 1.6
+++ multiple_servers.SF-1385152.py 30 Aug 2007 00:07:34 -0000 1.7
@@ -4,7 +4,7 @@
srvcmd = '%s --set mapi_port=%s --dbinit
"module(pathfinder);module(sql_server);mil_start();"' %
(os.getenv('MSERVER'),os.getenv('MAPIPORT'))
srv = os.popen(srvcmd, 'w')
time.sleep(10) # give server time to start
- cltcmd = os.getenv('MAPI_CLIENT')
+ cltcmd = os.getenv('MIL_CLIENT')
clt = os.popen(cltcmd, 'w')
clt.close()
srv.close()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
