Update of /cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19976/tests/BugDay_2005-12-19_0.9.3/Tests
Modified Files:
Tag: M5XQ
multiple_servers_2.SF-1385152.py
Log Message:
propagated changes of Friday Oct 16 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/16 - sjoerd:
tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py,1.10
propagated changes of Thursday Oct 15 2009 - Friday Oct 16 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/15 - sjoerd:
tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py,1.7.24.3
New module MonetDBtesting.process to make it easier to write tests in
Python.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
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.18.2
retrieving revision 1.7.18.3
diff -u -d -r1.7.18.2 -r1.7.18.3
--- multiple_servers_2.SF-1385152.py 13 Oct 2009 14:52:24 -0000 1.7.18.2
+++ multiple_servers_2.SF-1385152.py 16 Oct 2009 08:52:16 -0000 1.7.18.3
@@ -1,13 +1,12 @@
import os, time, sys
-import subprocess
+from MonetDBtesting import process
def server_start(x,s,dbinit):
- srvcmd = '%s --dbname "%s" --dbinit "%s"' %
(os.getenv('MSERVER'),os.getenv('TSTDB'),dbinit)
sys.stdout.write('\nserver %d%d : "%s"\n' % (x,s,dbinit))
sys.stderr.write('\nserver %d%d : "%s"\n' % (x,s,dbinit))
sys.stdout.flush()
sys.stderr.flush()
- srv = subprocess.Popen(srvcmd, shell = True, stdin = subprocess.PIPE)
+ srv = process.server('mil', dbinit = dbinit, stdin = process.PIPE)
time.sleep(5) # give server time to start
return srv
@@ -15,58 +14,56 @@
srv.communicate()
def client(x,s, c, dbinit, lang, cmd, h):
- cltcmd = os.getenv('%s_CLIENT' % lang)
sys.stdout.write('\nserver %d%d : "%s", client %d: %s%s\n' %
(x,s,dbinit,c,h,lang))
sys.stderr.write('\nserver %d%d : "%s", client %d: %s%s\n' %
(x,s,dbinit,c,h,lang))
sys.stdout.flush()
sys.stderr.flush()
- clt = subprocess.Popen(cltcmd, shell = True, stdin = subprocess.PIPE)
+ 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 ; 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)
+ 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)
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,'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 = 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)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
- 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)
+ 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)
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,'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 = 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)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
- 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)
+ 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)
server_stop(srv)
s += 1; srv = server_start(x,s,dbinit)
- 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)
+ 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)
server_stop(srv)
def main():
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
