Update of /cvsroot/monetdb/sql/src/test/Skyserver/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20774/src/test/Skyserver/Tests
Modified Files:
Tag: Nov2009
Skyserver.SQL.py Skyserver_v6.SQL.py
Log Message:
New module MonetDBtesting.process to make it easier to write tests in Python.
U Skyserver_v6.SQL.py
Index: Skyserver_v6.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py,v
retrieving revision 1.5.8.2
retrieving revision 1.5.8.3
diff -u -d -r1.5.8.2 -r1.5.8.3
--- Skyserver_v6.SQL.py 12 Oct 2009 15:36:22 -0000 1.5.8.2
+++ Skyserver_v6.SQL.py 15 Oct 2009 15:50:54 -0000 1.5.8.3
@@ -1,66 +1,66 @@
import os, sys
-import subprocess
+from MonetDBtesting import process
def main():
+ user = 'skyserver'
+ passwd = 'skyserver'
dir = os.getenv('TSTSRCDIR')
- clcmd = str(os.getenv('SQL_CLIENT'))
- clcmd1 = str(os.getenv('SQL_CLIENT')) + " -uskyserver -Pskyserver"
sys.stdout.write('Create User\n')
- clt = subprocess.Popen(clcmd + ' "%s"' % os.path.join(dir,
'..','create_user.sql'), shell = True, universal_newlines = True, stdout =
subprocess.PIPE)
+ clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
sys.stdout.write('tables\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','..','..','sql','math.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','..','..','sql','cache.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','..','..','sql','skyserver.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_tables_v6.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables_v6.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1, shell = True, universal_newlines = True,
stdin = subprocess.PIPE, stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE)
sql = open(os.path.join(dir, '..',
'Skyserver_import_v6.sql')).read().replace('DATA_DIR',os.path.join(dir,'..','microsky_v6').replace('\\','\\\\'))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_constraints_v6.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints_v6.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('views\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_views_v6.sql'), shell = True, universal_newlines = True, stdout
= subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_views_v6.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('functions\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_functions_v6.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_functions_v6.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('Cleanup\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropFunctions_v6.sql'), shell = True, universal_newlines =
True, stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropFunctions_v6.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropMs_functions.sql'), shell = True, universal_newlines =
True, stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropMath.sql'), shell = True, universal_newlines = True, stdout
= subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropCache.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropCache.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropViews_v6.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropViews_v6.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropConstraints_v6.sql'), shell = True, universal_newlines =
True, stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropConstraints_v6.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropTables_v6.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropTables_v6.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('Remove User\n')
- clt = subprocess.Popen(clcmd + ' "%s"' % os.path.join(dir,
'..','drop_user.sql'), shell = True, universal_newlines = True, stdout =
subprocess.PIPE)
+ clt = process.client('sql', args = [os.path.join(dir,
'..','drop_user.sql')], stdout = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
U Skyserver.SQL.py
Index: Skyserver.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Tests/Skyserver.SQL.py,v
retrieving revision 1.6.8.2
retrieving revision 1.6.8.3
diff -u -d -r1.6.8.2 -r1.6.8.3
--- Skyserver.SQL.py 12 Oct 2009 15:36:22 -0000 1.6.8.2
+++ Skyserver.SQL.py 15 Oct 2009 15:50:54 -0000 1.6.8.3
@@ -1,66 +1,66 @@
import os, sys
-import subprocess
+from MonetDBtesting import process
def main():
+ user = 'skyserver'
+ passwd = 'skyserver'
dir = os.getenv('TSTSRCDIR')
- clcmd = str(os.getenv('SQL_CLIENT'))
- clcmd1 = str(os.getenv('SQL_CLIENT')) + " -uskyserver -Pskyserver"
sys.stdout.write('Create User\n')
- clt = subprocess.Popen(clcmd + ' "%s"' % os.path.join(dir,
'..','create_user.sql'), shell = True, universal_newlines = True, stdout =
subprocess.PIPE)
+ clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
sys.stdout.write('tables\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','..','..','sql','math.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','..','..','sql','cache.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','..','..','sql','skyserver.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_tables.sql'), shell = True, universal_newlines = True, stdout =
subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1, shell = True, universal_newlines = True,
stdin = subprocess.PIPE, stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE)
sql = open(os.path.join(dir, '..',
'Skyserver_import.sql')).read().replace('DATA',os.path.join(dir,'..','microsky').replace('\\','\\\\'))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_constraints.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('views\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_views.sql'), shell = True, universal_newlines = True, stdout =
subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_views.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('functions\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_functions.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_functions.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('Cleanup\n')
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropFunctions.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropFunctions.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropMs_functions.sql'), shell = True, universal_newlines =
True, stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropMath.sql'), shell = True, universal_newlines = True, stdout
= subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropCache.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropCache.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropViews.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropViews.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropConstraints.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropConstraints.sql')], stdout =
process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = subprocess.Popen(clcmd1 + ' "%s"' % os.path.join(dir,
'..','Skyserver_dropTables.sql'), shell = True, universal_newlines = True,
stdout = subprocess.PIPE)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropTables.sql')], stdout = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
sys.stdout.write('Remove User\n')
- clt = subprocess.Popen(clcmd + ' "%s"' % os.path.join(dir,
'..','drop_user.sql'), shell = True, universal_newlines = True, stdout =
subprocess.PIPE)
+ clt = process.client('sql', args = [os.path.join(dir,
'..','drop_user.sql')], stdout = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
------------------------------------------------------------------------------
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
