Update of /cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22546/tests/BugDay_2005-12-19_0.9.3/Tests
Modified Files:
multiple_servers_2.SF-1385152.py
Log Message:
propagated changes of Wednesday Nov 11 2009 - Thursday Nov 12 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/11 - stmane:
tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py,1.7.24.4
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.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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- multiple_servers_2.SF-1385152.py 16 Oct 2009 08:43:28 -0000 1.10
+++ multiple_servers_2.SF-1385152.py 12 Nov 2009 08:40:06 -0000 1.11
@@ -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():
------------------------------------------------------------------------------
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
