Update of /cvsroot/monetdb/sql/src/test/Connections/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23680/src/test/Connections/Tests
Modified Files:
connections.py
Log Message:
propagated changes of Monday Oct 12 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/12 - sjoerd: src/test/Connections/Tests/connections.py,1.10.12.2
propagated changes of Monday Oct 12 2009
from the Aug2009 branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/12 - sjoerd: src/test/Connections/Tests/connections.py,1.10.10.2
In order to get this test to not get killed by a timeout, close the
two server processes in the opposite order.
Also some cleanup.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: connections.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Connections/Tests/connections.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- connections.py 9 Oct 2009 15:43:21 -0000 1.11
+++ connections.py 12 Oct 2009 13:19:02 -0000 1.12
@@ -5,17 +5,10 @@
# use private copy for old Python versions
import MonetDBtesting.subprocess26 as subprocess
-def clean_ports(cmd,mapiport,xrpcport):
- cmd = cmd.replace('--port=%s' % mapiport,'--port=<mapi_port>')
- cmd = cmd.replace('--set mapi_port=%s' % mapiport,'--set
mapi_port=<mapi_port>')
- cmd = cmd.replace('--set xrpc_port=%s' % xrpcport,'--set
xrpc_port=<xrpc_port>')
- return cmd
-
def remote_server_start(x,s,dbinit):
port = os.getenv('MAPIPORT')
srvcmd = '%s --dbfarm "%s" --dbname "%s_test1" --dbinit="%s"' %
(os.getenv('MSERVER'),os.getenv('GDK_DBFARM'), os.getenv('TSTDB'),dbinit)
srvcmd = srvcmd.replace(port,str(int(port)+1))
- srvcmd_ = clean_ports(srvcmd,str(int(port)+1),os.getenv('XRPCPORT'))
sys.stdout.write('\nserver %d%d : "%s"\n' % (x,s, dbinit))
sys.stderr.write('\nserver %d%d : "%s"\n' % (x,s, dbinit))
sys.stderr.flush()
@@ -29,7 +22,6 @@
def server_start(x,s,dbinit):
port = int(os.getenv('MAPIPORT'))
srvcmd = '%s --dbfarm "%s" --dbname "%s" --dbinit="%s"' %
(os.getenv('MSERVER'),os.getenv('GDK_DBFARM'), os.getenv('TSTDB'),dbinit)
- srvcmd_ = clean_ports(srvcmd,str(port),os.getenv('XRPCPORT'))
sys.stdout.write('\nserver %d%d : "%s"\n' % (x,s, dbinit))
sys.stderr.write('\nserver %d%d : "%s"\n' % (x,s, dbinit))
sys.stderr.flush()
@@ -54,11 +46,9 @@
def client(x,s, c, dbinit, lang, file):
cltcmd = '%s' % os.getenv('%s_CLIENT' % lang)
- cltcmd_ = clean_ports(cltcmd,os.getenv('MAPIPORT'),os.getenv('XRPCPORT'))
sys.stdout.write('\nserver %d%d : "%s", client %d: %s\n' %
(x,s,dbinit,c,lang))
sys.stderr.write('\nserver %d%d : "%s", client %d: %s\n' %
(x,s,dbinit,c,lang))
sys.stderr.flush()
- #sys.stderr.write('\nclient%d: "%s"\n' % (x,cltcmd_))
sys.stderr.write('#client%d: "%s"\n' % (x,cltcmd))
sys.stdout.flush()
sys.stderr.flush()
@@ -77,8 +67,8 @@
c += 1; h = client(x,s,c,dbinit,'SQL' ,
os.path.join(os.getenv('RELSRCDIR'),'..','connections_syntax.sql'))
c += 1; h = client(x,s,c,dbinit,'SQL' ,
os.path.join(os.getenv('RELSRCDIR'),'..','connections_semantic.sql'))
c += 1; h = client(x,s,c,dbinit,'SQL',
os.path.join(os.getenv('RELSRCDIR'),'..','connections_default_values.sql'))
- server_stop(srv)
server_stop(remote_srv)
+ server_stop(srv)
def main():
x = 0
------------------------------------------------------------------------------
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
