Update of /cvsroot/monetdb/sql/src/test/Skyserver/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24424/src/test/Skyserver/Tests
Modified Files:
Skyserver.SQL.py Skyserver_v6.SQL.py
Log Message:
fix test scripts to work without -P option
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
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Skyserver_v6.SQL.py 23 Jan 2009 17:27:27 -0000 1.5
+++ Skyserver_v6.SQL.py 7 Oct 2009 11:59:11 -0000 1.6
@@ -1,49 +1,51 @@
import os, sys
+import copy
+try:
+ import subprocess
+except ImportError:
+ # use private copy for old Python versions
+ import MonetDBtesting.subprocess26 as subprocess
+
+def client(cmd, env=os.environ):
+ clt = subprocess.Popen(cmd, env=env, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
+ sys.stdout.write(clt.stdout.read())
+ clt.stdout.close()
+ sys.stderr.write(clt.stderr.read())
+ clt.stderr.close()
def main():
dir = os.getenv('TSTSRCDIR')
clcmd = str(os.getenv('SQL_CLIENT'))
- clcmd1 = str(os.getenv('SQL_CLIENT')) + " -uskyserver -Pskyserver"
+ skyenv = copy.deepcopy(os.environ)
+ skyenv['DOTMONETDBFILE'] = '.skyserver'
+ f = open(skyenv['DOTMONETDBFILE'], 'wb')
+ f.write('user=skyserver\npassword=skyserver\n')
+ f.close()
sys.stdout.write('Create User\n')
- clt = os.popen(clcmd + "<%s" % ('%s/../create_user.sql' % dir), 'w')
- clt.close()
+ client(clcmd + "<%s" % ('%s/../create_user.sql' % dir))
sys.stdout.write('tables\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/math.sql' % dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/cache.sql' % dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/skyserver.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_tables_v6.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen("cat %s/../Skyserver_import_v6.sql | sed -e
\"s|DATA_DIR|%s/../microsky_v6|g\" | %s " % (dir, dir, clcmd1), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_constraints_v6.sql' %
dir), 'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../../../sql/math.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../../../sql/cache.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../../../sql/skyserver.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_tables_v6.sql' % dir), skyenv)
+ client("cat %s/../Skyserver_import_v6.sql | sed -e
\"s|DATA|%s/../microsky|g\" | %s " % (dir, dir, clcmd), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_constraints_v6.sql' % dir),
skyenv)
sys.stdout.write('views\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_views_v6.sql' % dir),
'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../Skyserver_views_v6.sql' % dir), skyenv)
sys.stdout.write('functions\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_functions_v6.sql' %
dir), 'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../Skyserver_functions_v6.sql' % dir), skyenv)
sys.stdout.write('Cleanup\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropFunctions_v6.sql' %
dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMs_functions.sql' %
dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMath.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropCache.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropViews_v6.sql' %
dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropConstraints_v6.sql'
% dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropTables_v6.sql' %
dir), 'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropFunctions_v6.sql' % dir),
skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropMs_functions.sql' % dir),
skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropMath.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropCache.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropViews.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropConstraints_v6.sql' % dir),
skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropTables_v6.sql' % dir), skyenv)
sys.stdout.write('Remove User\n')
- clt = os.popen(clcmd + "<%s" % ('%s/../drop_user.sql' % dir), 'w')
- clt.close()
+ client(clcmd + "<%s" % ('%s/../drop_user.sql' % dir))
+
+ os.unlink(skyenv['DOTMONETDBFILE'])
main()
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
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Skyserver.SQL.py 22 Nov 2008 18:13:03 -0000 1.6
+++ Skyserver.SQL.py 7 Oct 2009 11:59:11 -0000 1.7
@@ -1,49 +1,51 @@
import os, sys
+import copy
+try:
+ import subprocess
+except ImportError:
+ # use private copy for old Python versions
+ import MonetDBtesting.subprocess26 as subprocess
+
+def client(cmd, env=os.environ):
+ clt = subprocess.Popen(cmd, env=env, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
+ sys.stdout.write(clt.stdout.read())
+ clt.stdout.close()
+ sys.stderr.write(clt.stderr.read())
+ clt.stderr.close()
def main():
dir = os.getenv('TSTSRCDIR')
clcmd = str(os.getenv('SQL_CLIENT'))
- clcmd1 = str(os.getenv('SQL_CLIENT')) + " -uskyserver -Pskyserver"
+ skyenv = copy.deepcopy(os.environ)
+ skyenv['DOTMONETDBFILE'] = '.skyserver'
+ f = open(skyenv['DOTMONETDBFILE'], 'wb')
+ f.write('user=skyserver\npassword=skyserver\n')
+ f.close()
sys.stdout.write('Create User\n')
- clt = os.popen(clcmd + "<%s" % ('%s/../create_user.sql' % dir), 'w')
- clt.close()
+ client(clcmd + "<%s" % ('%s/../create_user.sql' % dir))
sys.stdout.write('tables\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/math.sql' % dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/cache.sql' % dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/skyserver.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_tables.sql' % dir), 'w')
- clt1.close()
- clt1 = os.popen("cat %s/../Skyserver_import.sql | sed -e
\"s|DATA|%s/../microsky|g\" | %s " % (dir, dir, clcmd1), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_constraints.sql' %
dir), 'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../../../sql/math.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../../../sql/cache.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../../../sql/skyserver.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_tables.sql' % dir), skyenv)
+ client("cat %s/../Skyserver_import.sql | sed -e
\"s|DATA|%s/../microsky|g\" | %s " % (dir, dir, clcmd), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_constraints.sql' % dir), skyenv)
sys.stdout.write('views\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_views.sql' % dir), 'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../Skyserver_views.sql' % dir), skyenv)
sys.stdout.write('functions\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_functions.sql' % dir),
'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../Skyserver_functions.sql' % dir), skyenv)
sys.stdout.write('Cleanup\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropFunctions.sql' %
dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMs_functions.sql' %
dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMath.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropCache.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropViews.sql' % dir),
'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropConstraints.sql' %
dir), 'w')
- clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropTables.sql' % dir),
'w')
- clt1.close()
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropFunctions.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropMs_functions.sql' % dir),
skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropMath.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropCache.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropViews.sql' % dir), skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropConstraints.sql' % dir),
skyenv)
+ client(clcmd + "<%s" % ('%s/../Skyserver_dropTables.sql' % dir), skyenv)
sys.stdout.write('Remove User\n')
- clt = os.popen(clcmd + "<%s" % ('%s/../drop_user.sql' % dir), 'w')
- clt.close()
+ client(clcmd + "<%s" % ('%s/../drop_user.sql' % dir))
+
+ os.unlink(skyenv['DOTMONETDBFILE'])
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
