Update of /cvsroot/monetdb/sql/src/test/BugTracker/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20774/src/test/BugTracker/Tests
Modified Files:
Tag: Nov2009
auto_commit.SF-1724151.SQL.py connect_crash.SF-1436626.py
mdb_starts_with_sql_debug_64.SF-1999354.py
set_a_new_user_password.SF-1844050.py
set_sql_debug_64__breaking_the_DB.SF-1906287.py
Log Message:
New module MonetDBtesting.process to make it easier to write tests in Python.
U set_sql_debug_64__breaking_the_DB.SF-1906287.py
Index: set_sql_debug_64__breaking_the_DB.SF-1906287.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- set_sql_debug_64__breaking_the_DB.SF-1906287.py 12 Oct 2009 15:36:20
-0000 1.6.2.2
+++ set_sql_debug_64__breaking_the_DB.SF-1906287.py 15 Oct 2009 15:50:49
-0000 1.6.2.3
@@ -1,53 +1,27 @@
import os, time, sys
-import 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
+from MonetDBtesting import process
-def server_start(debug,dbinit):
- port = int(os.getenv('MAPIPORT'))
- srvcmd = '%s --dbfarm "%s" --dbname "%s" --dbinit="%s" %s' %
(os.getenv('MSERVER'),os.getenv('GDK_DBFARM'), os.getenv('TSTDB'),dbinit,debug)
- srvcmd_ = clean_ports(srvcmd,str(port),os.getenv('XRPCPORT'))
- sys.stderr.write('#mserver: "%s"\n' % (srvcmd))
+def server_start(args = []):
+ sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = subprocess.Popen(srvcmd, shell = True, stdin = subprocess.PIPE)
+ srv = process.server('sql', args = args, stdin = process.PIPE)
time.sleep(5) # give server time to start
return srv
-def server_stop(srv):
- srv.communicate()
- time.sleep(2) # give server time to stop
-
-def client_load_file(clt, port, file):
- f = open(file, 'r')
- for line in f:
- clt.stdin.write(line)
- f.close()
-
-
-def client(lang, file):
- cltcmd = '%s' % os.getenv('%s_CLIENT' % lang)
- cltcmd_ = clean_ports(cltcmd,os.getenv('MAPIPORT'),os.getenv('XRPCPORT'))
- sys.stderr.flush()
- sys.stderr.write('#client: "%s"\n' % (cltcmd))
+def client(file):
+ sys.stderr.write('#client\n')
sys.stderr.flush()
- clt = subprocess.Popen(cltcmd, shell = True, stdin = subprocess.PIPE)
- port = int(os.getenv('MAPIPORT'))
- client_load_file(clt, port, file)
+ clt = process.client('sql', stdin = open(file))
clt.communicate()
- return '%s ' % (lang)
-
def main():
- dbinit = "include sql;"
- srv = server_start("--set sql_debug=64",dbinit)
- client('SQL' ,
'%s/set_sql_debug_64__breaking_the_DB.SF-1906287_create.sql' %
os.getenv('RELSRCDIR'))
- server_stop(srv)
- srv = server_start("",dbinit)
- client('SQL' , '%s/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql'
% os.getenv('RELSRCDIR'))
- server_stop(srv)
+ srv = server_start(["--set", "sql_debug=64"])
+ client(os.path.join(os.getenv('RELSRCDIR'),
+
'set_sql_debug_64__breaking_the_DB.SF-1906287_create.sql'))
+ srv.communicate()
+ srv = server_start()
+ client(os.path.join(os.getenv('RELSRCDIR'),
+
'set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql'))
+ srv.communicate()
main()
U connect_crash.SF-1436626.py
Index: connect_crash.SF-1436626.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/connect_crash.SF-1436626.py,v
retrieving revision 1.5.10.3
retrieving revision 1.5.10.4
diff -u -d -r1.5.10.3 -r1.5.10.4
--- connect_crash.SF-1436626.py 12 Oct 2009 15:36:20 -0000 1.5.10.3
+++ connect_crash.SF-1436626.py 15 Oct 2009 15:50:49 -0000 1.5.10.4
@@ -1,14 +1,11 @@
import os, time
-import subprocess
+from MonetDBtesting import process
def main():
- srvcmd = '%s --dbname "%s" --dbinit "include sql;"' %
(os.getenv('MSERVER'),os.getenv('TSTDB'))
- srv = subprocess.Popen(srvcmd, shell = True, stdin = subprocess.PIPE)
+ srv = process.server('sql', stdin = process.PIPE)
time.sleep(10) # give server time to start
- cltcmd = os.getenv('SQL_CLIENT')
- clt = subprocess.Popen(cltcmd, shell = True, stdin = subprocess.PIPE)
- clt.stdin.write('select 1;\n')
- clt.communicate()
+ clt = process.client('sql', stdin = process.PIPE)
+ clt.communicate('select 1;\n')
srv.communicate()
main()
U set_a_new_user_password.SF-1844050.py
Index: set_a_new_user_password.SF-1844050.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- set_a_new_user_password.SF-1844050.py 12 Oct 2009 15:36:20 -0000
1.6.2.2
+++ set_a_new_user_password.SF-1844050.py 15 Oct 2009 15:50:49 -0000
1.6.2.3
@@ -1,65 +1,30 @@
import os, time, sys
-import 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 clean_login(cmd,user,passwd):
- cmd = cmd.replace('-umonetdb','-u%s' % user)
- cmd = cmd.replace('-Pmonetdb','-P%s' % passwd)
- return cmd
+from MonetDBtesting import process
-def server_start(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.stderr.write('#mserver: "%s"\n' % (srvcmd))
+def server_start(lang):
+ sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = subprocess.Popen(srvcmd, shell = True, stdin = subprocess.PIPE)
+ srv = process.server(lang, stdin = process.PIPE)
time.sleep(5) # give server time to start
return srv
-def server_stop(srv):
- srv.communicate()
- time.sleep(2) # give server time to stop
-
-def client_load_file(clt, port, file):
- f = open(file, 'r')
- for line in f:
- clt.stdin.write(line)
- f.close()
-
-
-def client(lang, file, user, passwd):
- cltcmd = '%s' % os.getenv('%s_CLIENT' % lang)
- cltcmd_ = clean_ports(cltcmd,os.getenv('MAPIPORT'),os.getenv('XRPCPORT'))
- cltcmd_ = clean_login(cltcmd,user, passwd)
- sys.stderr.flush()
- sys.stderr.write('#client: "%s"\n' % (cltcmd_))
+def client(lang, file, user = None, passwd = None):
+ sys.stderr.write('#client\n')
sys.stderr.flush()
- clt = subprocess.Popen(cltcmd, shell = True, stdin = subprocess.PIPE)
- port = int(os.getenv('MAPIPORT'))
- client_load_file(clt, port, file)
+ clt = process.client(lang, user = user, passwd = passwd, stdin =
open(file))
clt.communicate()
- return '%s ' % (lang)
-
def main():
- dbinit = "include sql;"
-
- srv = server_start(dbinit)
- client('SQL' , '%s/set_a_new_user_password.SF-1844050_create_user.sql' %
os.getenv('RELSRCDIR'), "monetdb", "monetdb")
- server_stop(srv)
+ srv = server_start('sql')
+ client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_create_user.sql'))
+ srv.communicate()
- srv = server_start(dbinit)
- client('SQL' , '%s/set_a_new_user_password.SF-1844050_select.sql' %
os.getenv('RELSRCDIR'), "voc2", "new")
- server_stop(srv)
+ srv = server_start('sql')
+ client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_select.sql'), "voc2", "new")
+ srv.communicate()
- srv = server_start(dbinit)
- client('SQL' , '%s/set_a_new_user_password.SF-1844050_drop_user.sql' %
os.getenv('RELSRCDIR'), "monetdb", "monetdb")
- server_stop(srv)
+ srv = server_start('sql')
+ client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_drop_user.sql'))
+ srv.communicate()
main()
U auto_commit.SF-1724151.SQL.py
Index: auto_commit.SF-1724151.SQL.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py,v
retrieving revision 1.2
retrieving revision 1.2.14.1
diff -u -d -r1.2 -r1.2.14.1
--- auto_commit.SF-1724151.SQL.py 29 Oct 2007 20:11:52 -0000 1.2
+++ auto_commit.SF-1724151.SQL.py 15 Oct 2009 15:50:49 -0000 1.2.14.1
@@ -1,5 +1,8 @@
import os, sys
+from MonetDBtesting import process
-cltcmd = '%s "%s"' % (os.getenv('SQL_CLIENT'),
os.path.join(os.getenv('TSTSRCDIR'), sys.argv[1]+".txt"))
-
-os.system(cltcmd);
+c = process.client('sql',
+ args = [os.path.join(os.getenv('TSTSRCDIR'),
+ '%s.txt' % sys.argv[1])],
+ stdin = process.PIPE)
+c.communicate()
U mdb_starts_with_sql_debug_64.SF-1999354.py
Index: mdb_starts_with_sql_debug_64.SF-1999354.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- mdb_starts_with_sql_debug_64.SF-1999354.py 12 Oct 2009 15:36:20 -0000
1.5.2.2
+++ mdb_starts_with_sql_debug_64.SF-1999354.py 15 Oct 2009 15:50:49 -0000
1.5.2.3
@@ -1,51 +1,23 @@
import os, time, sys
-import 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
+from MonetDBtesting import process
-def server_start(debug,dbinit):
- port = int(os.getenv('MAPIPORT'))
- srvcmd = '%s --dbfarm "%s" --dbname "%s" --dbinit="%s" %s' %
(os.getenv('MSERVER'),os.getenv('GDK_DBFARM'), os.getenv('TSTDB'),dbinit,debug)
- srvcmd_ = clean_ports(srvcmd,str(port),os.getenv('XRPCPORT'))
- sys.stderr.write('#mserver: "%s"\n' % (srvcmd))
+def server_start(args):
+ sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
sys.stderr.flush()
- srv = subprocess.Popen(srvcmd, shell = True, stdin = subprocess.PIPE)
+ srv = process.server('sql', args = args, stdin = process.PIPE)
time.sleep(5) # give server time to start
return srv
-def server_stop(srv):
- srv.communicate()
- time.sleep(2) # give server time to stop
-
-def client_load_file(clt, port, file):
- f = open(file, 'r')
- for line in f:
- clt.stdin.write(line)
- f.close()
-
-
def client(lang, file):
- cltcmd = '%s' % os.getenv('%s_CLIENT' % lang)
- cltcmd_ = clean_ports(cltcmd,os.getenv('MAPIPORT'),os.getenv('XRPCPORT'))
- sys.stderr.flush()
- sys.stderr.write('#client: "%s"\n' % (cltcmd))
+ sys.stderr.write('#client: "%s"\n' % file)
sys.stderr.flush()
- clt = subprocess.Popen(cltcmd, shell = True, stdin = subprocess.PIPE)
- port = int(os.getenv('MAPIPORT'))
- client_load_file(clt, port, file)
+ clt = process.client(lang.lower(), stdin = open(file))
clt.communicate()
- return '%s ' % (lang)
-
def main():
- dbinit = "include sql;"
- srv = server_start("--set sql_debug=64",dbinit)
- client('SQL' , '%s/../../../sql/skyserver.sql' % os.getenv('RELSRCDIR'))
- client('SQL' , '%s/mdb_starts_with_sql_debug_64.SF-1999354.sql' %
os.getenv('RELSRCDIR'))
- server_stop(srv)
+ srv = server_start(["--set", "sql_debug=64"])
+ client('SQL' , os.path.join(os.getenv('RELSRCDIR'), '..', '..', '..',
'sql', 'skyserver.sql'))
+ client('SQL' , os.path.join(os.getenv('RELSRCDIR'),
'mdb_starts_with_sql_debug_64.SF-1999354.sql'))
+ srv.communicate()
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
