Changeset: 88ac4300b565 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88ac4300b565
Modified Files:
        sql/src/test/Skyserver/Tests/Skyserver.SQL.py
        sql/src/test/Skyserver/Tests/Skyserver.stable.err
        sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py
        sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err
Branch: Jun2010
Log Message:

collect stderr just like stdout and added more tracing/logging
to facilitate crash debugging


diffs (234 lines):

diff -r b07eddeea814 -r 88ac4300b565 
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver.SQL.py     Mon Aug 16 12:35:56 
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver.SQL.py     Mon Aug 16 13:15:32 
2010 +0200
@@ -6,59 +6,81 @@
     passwd = 'skyserver'
     dir = os.getenv('TSTSRCDIR')
     sys.stdout.write('Create User\n')
-    clt = process.client('sql', args = [os.path.join(dir, 
'..','create_user.sql')], stdout = process.PIPE)
+    sys.stderr.write('Create User\n')
+    clt = process.client('sql', args = [os.path.join(dir, 
'..','create_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
     out,err = clt.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('tables\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
+    sys.stderr.write('tables\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout = 
process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE, stderr 
= process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, stdin = 
process.PIPE, stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, stdin = 
process.PIPE, stdout = process.PIPE, stderr = 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 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_constraints.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_constraints.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('views\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_views.sql')], stdout = process.PIPE)
+    sys.stderr.write('views\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_views.sql')], stdout = process.PIPE, stderr 
= process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('functions\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_functions.sql')], stdout = process.PIPE)
+    sys.stderr.write('functions\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_functions.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('Cleanup\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropFunctions.sql')], stdout = process.PIPE)
+    sys.stderr.write('Cleanup\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropFunctions.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout = 
process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropViews.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropViews.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropConstraints.sql')], stdout = 
process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropConstraints.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropTables.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropTables.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('Remove User\n')
-    clt = process.client('sql', args = [os.path.join(dir, 
'..','drop_user.sql')], stdout = process.PIPE)
+    sys.stderr.write('Remove User\n')
+    clt = process.client('sql', args = [os.path.join(dir, 
'..','drop_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
     out,err = clt.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
 
 main()
diff -r b07eddeea814 -r 88ac4300b565 
sql/src/test/Skyserver/Tests/Skyserver.stable.err
--- a/sql/src/test/Skyserver/Tests/Skyserver.stable.err Mon Aug 16 12:35:56 
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver.stable.err Mon Aug 16 13:15:32 
2010 +0200
@@ -10,6 +10,12 @@
 # 18:20:19 >  Mtimeout -timeout 60 ./Skyserver.SQL Skyserver 
 # 18:20:19 >  
 
+Create User
+tables
+views
+functions
+Cleanup
+Remove User
 
 # 18:20:22 >  
 # 18:20:22 >  Done.
diff -r b07eddeea814 -r 88ac4300b565 
sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py  Mon Aug 16 12:35:56 
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py  Mon Aug 16 13:15:32 
2010 +0200
@@ -6,59 +6,81 @@
     passwd = 'skyserver'
     dir = os.getenv('TSTSRCDIR')
     sys.stdout.write('Create User\n')
-    clt = process.client('sql', args = [os.path.join(dir, 
'..','create_user.sql')], stdout = process.PIPE)
+    sys.stderr.write('Create User\n')
+    clt = process.client('sql', args = [os.path.join(dir, 
'..','create_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
     out,err = clt.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('tables\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
+    sys.stderr.write('tables\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout = 
process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_tables_v6.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_tables_v6.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, stdin = 
process.PIPE, stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, stdin = 
process.PIPE, stdout = process.PIPE, stderr = 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 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_constraints_v6.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_constraints_v6.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('views\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_views_v6.sql')], stdout = process.PIPE)
+    sys.stderr.write('views\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_views_v6.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('functions\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_functions_v6.sql')], stdout = process.PIPE)
+    sys.stderr.write('functions\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_functions_v6.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('Cleanup\n')
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropFunctions_v6.sql')], stdout = 
process.PIPE)
+    sys.stderr.write('Cleanup\n')
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropFunctions_v6.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout = 
process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropViews_v6.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropViews_v6.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropConstraints_v6.sql')], stdout = 
process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropConstraints_v6.sql')], stdout = 
process.PIPE, stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
-    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropTables_v6.sql')], stdout = process.PIPE)
+    sys.stderr.write(err)
+    clt1 = process.client('sql', user = user, passwd = passwd, args = 
[os.path.join(dir, '..','Skyserver_dropTables_v6.sql')], stdout = process.PIPE, 
stderr = process.PIPE)
     out,err = clt1.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
     sys.stdout.write('Remove User\n')
-    clt = process.client('sql', args = [os.path.join(dir, 
'..','drop_user.sql')], stdout = process.PIPE)
+    sys.stderr.write('Remove User\n')
+    clt = process.client('sql', args = [os.path.join(dir, 
'..','drop_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
     out,err = clt.communicate()
     sys.stdout.write(out)
+    sys.stderr.write(err)
 
 main()
diff -r b07eddeea814 -r 88ac4300b565 
sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err      Mon Aug 16 
12:35:56 2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err      Mon Aug 16 
13:15:32 2010 +0200
@@ -12,6 +12,12 @@
 # 16:41:17 >  /usr/bin/python Skyserver_v6.SQL.py Skyserver_v6 
 # 16:41:17 >  
 
+Create User
+tables
+views
+functions
+Cleanup
+Remove User
 
 # 16:41:20 >  
 # 16:41:20 >  Done.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to