Update of /cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23572
Modified Files:
Tag: Nov2009
multiple_servers_2.SF-1385152.py
multiple_servers_2.SF-1385152.stable.err
multiple_servers_2.SF-1385152.stable.out
Removed Files:
Tag: Nov2009
multiple_servers_2.SF-1385152.timeout
Log Message:
restored original test functionality and updated stable output after
"
2009/10/15 - sjoerd: multiple_servers_2.SF-1385152.py,1.7.24.3
New module MonetDBtesting.process to make it easier to write tests in Python.
"
to make test work, again.
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.7
retrieving revision 1.7.24.1
diff -u -d -r1.7 -r1.7.24.1
--- multiple_servers_2.SF-1385152.stable.out 30 Aug 2007 00:07:34 -0000
1.7
+++ multiple_servers_2.SF-1385152.stable.out 11 Nov 2009 18:41:24 -0000
1.7.24.1
@@ -12,18 +12,18 @@
# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
-server 11 : "module(pathfinder); mil_start();", client 1: XQUERY
+server 11 : "module(pathfinder); mil_start();", client 1: xquery
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>111</XQueryResult>
-server 11 : "module(pathfinder); mil_start();", client 2: (XQUERY) XQUERY
+server 11 : "module(pathfinder); mil_start();", client 2: (xquery) xquery
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>112</XQueryResult>
-server 11 : "module(pathfinder); mil_start();", client 3: (XQUERY) (XQUERY) MIL
+server 11 : "module(pathfinder); mil_start();", client 3: (xquery) (xquery) mil
[ 113 ]
-server 11 : "module(pathfinder); mil_start();", client 4: (XQUERY) (XQUERY)
(MIL) MIL
+server 11 : "module(pathfinder); mil_start();", client 4: (xquery) (xquery)
(mil) mil
[ 114 ]
quit();
@@ -33,18 +33,18 @@
# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
-server 12 : "module(pathfinder); mil_start();", client 1: XQUERY
+server 12 : "module(pathfinder); mil_start();", client 1: xquery
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>121</XQueryResult>
-server 12 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
+server 12 : "module(pathfinder); mil_start();", client 2: (xquery) mil
[ 122 ]
-server 12 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) 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) (MIL)
(XQUERY) MIL
+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: MIL
+server 13 : "module(pathfinder); mil_start();", client 1: mil
[ 131 ]
-server 13 : "module(pathfinder); mil_start();", client 2: (MIL) 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: (MIL) (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: (MIL) (XQUERY)
(XQUERY) MIL
+server 13 : "module(pathfinder); mil_start();", client 4: (mil) (xquery)
(xquery) mil
[ 134 ]
quit();
@@ -75,17 +75,17 @@
# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
# Visit http://monetdb.cwi.nl/ for further information.
-server 14 : "module(pathfinder); mil_start();", client 1: XQUERY
+server 14 : "module(pathfinder); mil_start();", client 1: xquery
<?xml version="1.0" encoding="utf-8"?>
<XQueryResult>141</XQueryResult>
-server 14 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
+server 14 : "module(pathfinder); mil_start();", client 2: (xquery) mil
[ 142 ]
-server 14 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) MIL
+server 14 : "module(pathfinder); mil_start();", client 3: (xquery) (mil) mil
[ 143 ]
-server 14 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL) (MIL)
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: MIL
+server 15 : "module(pathfinder); mil_start();", client 1: mil
[ 151 ]
-server 15 : "module(pathfinder); mil_start();", client 2: (MIL) 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: (MIL) (XQUERY) MIL
+server 15 : "module(pathfinder); mil_start();", client 3: (mil) (xquery) mil
[ 153 ]
-server 15 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY) (MIL)
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: MIL
+server 16 : "module(pathfinder); mil_start();", client 1: mil
[ 161 ]
-server 16 : "module(pathfinder); mil_start();", client 2: (MIL) MIL
+server 16 : "module(pathfinder); mil_start();", client 2: (mil) mil
[ 162 ]
-server 16 : "module(pathfinder); mil_start();", client 3: (MIL) (MIL) 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: (MIL) (MIL) (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();
--- multiple_servers_2.SF-1385152.timeout DELETED ---
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.7.24.3
retrieving revision 1.7.24.4
diff -u -d -r1.7.24.3 -r1.7.24.4
--- multiple_servers_2.SF-1385152.py 15 Oct 2009 15:51:40 -0000 1.7.24.3
+++ multiple_servers_2.SF-1385152.py 11 Nov 2009 18:41:24 -0000 1.7.24.4
@@ -20,50 +20,51 @@
sys.stderr.flush()
clt = process.client(lang, stdin = process.PIPE)
clt.communicate(cmd)
+ return '%s(%s) ' % (h,lang)
def clients(x,dbinit):
s = 0
s += 1; srv = server_start(x,s,dbinit)
- c = 0 ;
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
+ 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,'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 ;
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
+ 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,'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,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
- c = 0 ;
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
+ c = 0 ; 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,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
- c = 0 ;
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
+ 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,'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 ;
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
+ c = 0 ; 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,'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 ;
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'mil' ,'print(%d%d%d);\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
- c += 1; client(x,s,c,dbinit,'xquery', '%d%d%d\n' % (x,s,c),h)
+ c = 0 ; 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)
def main():
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.7
retrieving revision 1.7.20.1
diff -u -d -r1.7 -r1.7.20.1
--- multiple_servers_2.SF-1385152.stable.err 26 Jan 2008 13:34:51 -0000
1.7
+++ multiple_servers_2.SF-1385152.stable.err 11 Nov 2009 18:41:24 -0000
1.7.20.1
@@ -8,63 +8,63 @@
server 11 : "module(pathfinder); mil_start();"
-server 11 : "module(pathfinder); mil_start();", client 1: XQUERY
+server 11 : "module(pathfinder); mil_start();", client 1: xquery
-server 11 : "module(pathfinder); mil_start();", client 2: (XQUERY) XQUERY
+server 11 : "module(pathfinder); mil_start();", client 2: (xquery) xquery
-server 11 : "module(pathfinder); mil_start();", client 3: (XQUERY) (XQUERY) MIL
+server 11 : "module(pathfinder); mil_start();", client 3: (xquery) (xquery) mil
-server 11 : "module(pathfinder); mil_start();", client 4: (XQUERY) (XQUERY)
(MIL) MIL
+server 11 : "module(pathfinder); mil_start();", client 4: (xquery) (xquery)
(mil) mil
server 12 : "module(pathfinder); mil_start();"
-server 12 : "module(pathfinder); mil_start();", client 1: XQUERY
+server 12 : "module(pathfinder); mil_start();", client 1: xquery
-server 12 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
+server 12 : "module(pathfinder); mil_start();", client 2: (xquery) mil
-server 12 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) XQUERY
+server 12 : "module(pathfinder); mil_start();", client 3: (xquery) (mil) xquery
-server 12 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL)
(XQUERY) MIL
+server 12 : "module(pathfinder); mil_start();", client 4: (xquery) (mil)
(xquery) mil
server 13 : "module(pathfinder); mil_start();"
-server 13 : "module(pathfinder); mil_start();", client 1: MIL
+server 13 : "module(pathfinder); mil_start();", client 1: mil
-server 13 : "module(pathfinder); mil_start();", client 2: (MIL) XQUERY
+server 13 : "module(pathfinder); mil_start();", client 2: (mil) xquery
-server 13 : "module(pathfinder); mil_start();", client 3: (MIL) (XQUERY) XQUERY
+server 13 : "module(pathfinder); mil_start();", client 3: (mil) (xquery) xquery
-server 13 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY)
(XQUERY) MIL
+server 13 : "module(pathfinder); mil_start();", client 4: (mil) (xquery)
(xquery) mil
server 14 : "module(pathfinder); mil_start();"
-server 14 : "module(pathfinder); mil_start();", client 1: XQUERY
+server 14 : "module(pathfinder); mil_start();", client 1: xquery
-server 14 : "module(pathfinder); mil_start();", client 2: (XQUERY) MIL
+server 14 : "module(pathfinder); mil_start();", client 2: (xquery) mil
-server 14 : "module(pathfinder); mil_start();", client 3: (XQUERY) (MIL) MIL
+server 14 : "module(pathfinder); mil_start();", client 3: (xquery) (mil) mil
-server 14 : "module(pathfinder); mil_start();", client 4: (XQUERY) (MIL) (MIL)
XQUERY
+server 14 : "module(pathfinder); mil_start();", client 4: (xquery) (mil) (mil)
xquery
server 15 : "module(pathfinder); mil_start();"
-server 15 : "module(pathfinder); mil_start();", client 1: MIL
+server 15 : "module(pathfinder); mil_start();", client 1: mil
-server 15 : "module(pathfinder); mil_start();", client 2: (MIL) XQUERY
+server 15 : "module(pathfinder); mil_start();", client 2: (mil) xquery
-server 15 : "module(pathfinder); mil_start();", client 3: (MIL) (XQUERY) MIL
+server 15 : "module(pathfinder); mil_start();", client 3: (mil) (xquery) mil
-server 15 : "module(pathfinder); mil_start();", client 4: (MIL) (XQUERY) (MIL)
XQUERY
+server 15 : "module(pathfinder); mil_start();", client 4: (mil) (xquery) (mil)
xquery
server 16 : "module(pathfinder); mil_start();"
-server 16 : "module(pathfinder); mil_start();", client 1: MIL
+server 16 : "module(pathfinder); mil_start();", client 1: mil
-server 16 : "module(pathfinder); mil_start();", client 2: (MIL) MIL
+server 16 : "module(pathfinder); mil_start();", client 2: (mil) mil
-server 16 : "module(pathfinder); mil_start();", client 3: (MIL) (MIL) XQUERY
+server 16 : "module(pathfinder); mil_start();", client 3: (mil) (mil) xquery
-server 16 : "module(pathfinder); mil_start();", client 4: (MIL) (MIL) (XQUERY)
XQUERY
+server 16 : "module(pathfinder); mil_start();", client 4: (mil) (mil) (xquery)
xquery
# 19:48:15 >
# 19:48:15 > Done.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
