Changeset: 0fc1ce9d7571 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fc1ce9d7571
Modified Files:
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
sql/src/test/Connections/Tests/connections.py
Branch: Jun2010
Log Message:
Serialize output. This should fix bug 2621.
diffs (254 lines):
diff -r 755b9fac3283 -r 0fc1ce9d7571
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
--- a/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Mon Jul 19 10:20:25 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Mon Jul 19 10:58:40 2010 +0200
@@ -4,20 +4,32 @@
def server_start(args):
sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
sys.stderr.flush()
- srv = process.server('sql', args = args, stdin = process.PIPE)
+ srv = process.server('sql', args = args, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
def client(lang, file):
sys.stderr.write('#client: "%s"\n' % file)
sys.stderr.flush()
- clt = process.client(lang.lower(), stdin = open(file))
- clt.communicate()
+ clt = process.client(lang.lower(), stdin = open(file),
+ stdout = process.PIPE, stderr = process.PIPE)
+ return clt.communicate()
def main():
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()
+ out, err = client('SQL' ,
+ os.path.join(os.getenv('RELSRCDIR'),
+ '..', '..', '..', 'sql', 'skyserver.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ out, err = client('SQL',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'mdb_starts_with_sql_debug_64.SF-1999354.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ out, err = srv.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
main()
diff -r 755b9fac3283 -r 0fc1ce9d7571
sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
--- a/sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
Mon Jul 19 10:20:25 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
Mon Jul 19 10:58:40 2010 +0200
@@ -4,27 +4,49 @@
def server_start(lang):
sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = process.server(lang, stdin = process.PIPE)
+ srv = process.server(lang, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
def client(lang, file, user = 'monetdb', passwd = 'monetdb'):
sys.stderr.write('#client\n')
sys.stderr.flush()
- clt = process.client(lang, user = user, passwd = passwd, stdin =
open(file))
- clt.communicate()
+ clt = process.client(lang, user = user, passwd = passwd,
+ stdin = open(file),
+ stdout = process.PIPE, stderr = process.PIPE)
+ return clt.communicate()
def main():
srv = server_start('sql')
- client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_create_user.sql'))
- srv.communicate()
+ out, err = client('sql',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'set_a_new_user_password.SF-1844050_create_user.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ out, err = srv.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
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()
+ out, err = client('sql',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'set_a_new_user_password.SF-1844050_select.sql'),
+ "voc2", "new")
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ out, err = srv.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
srv = server_start('sql')
- client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_drop_user.sql'))
- srv.communicate()
+ out, err = client('sql',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'set_a_new_user_password.SF-1844050_drop_user.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ out, err = srv.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
main()
diff -r 755b9fac3283 -r 0fc1ce9d7571
sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
---
a/sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
Mon Jul 19 10:20:25 2010 +0200
+++
b/sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
Mon Jul 19 10:58:40 2010 +0200
@@ -4,24 +4,34 @@
def server_start(args = []):
sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = process.server('sql', args = args, stdin = process.PIPE)
+ srv = process.server('sql', args = args, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
def client(file):
sys.stderr.write('#client\n')
sys.stderr.flush()
- clt = process.client('sql', stdin = open(file))
- clt.communicate()
+ clt = process.client('sql', stdin = open(file),
+ stdout = process.PIPE, stderr = process.PIPE)
+ return clt.communicate()
def main():
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'))
+ out, err = client(os.path.join(os.getenv('RELSRCDIR'),
+
'set_sql_debug_64__breaking_the_DB.SF-1906287_create.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ out, err = srv.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ srv = server_start()
+ out, err = client(os.path.join(os.getenv('RELSRCDIR'),
+
'set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
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()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
main()
diff -r 755b9fac3283 -r 0fc1ce9d7571
sql/src/test/Connections/Tests/connections.py
--- a/sql/src/test/Connections/Tests/connections.py Mon Jul 19 10:20:25
2010 +0200
+++ b/sql/src/test/Connections/Tests/connections.py Mon Jul 19 10:58:40
2010 +0200
@@ -11,7 +11,8 @@
port = os.getenv('MAPIPORT', '50000')
srv = process.server('sql', mapiport = int(port) + 1,
dbname = '%s_test1' % os.getenv('TSTDB'),
- stdin = process.PIPE)
+ stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
@@ -22,12 +23,13 @@
sys.stderr.write('#mserver\n')
sys.stdout.flush()
sys.stderr.flush()
- srv = process.server('sql', stdin = process.PIPE)
+ srv = process.server('sql', stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
def server_stop(srv):
- srv.communicate()
+ return srv.communicate()
def client_load_file(clt, port, file):
f = open(file, 'r')
@@ -37,7 +39,6 @@
clt.stdin.write(line)
f.close()
-
def client(x,s, c, file):
sys.stdout.write('\nserver %d%d, client %d\n' % (x,s,c))
sys.stderr.write('\nserver %d%d, client %d\n' % (x,s,c))
@@ -45,25 +46,54 @@
sys.stderr.write('#client%d\n' % x)
sys.stdout.flush()
sys.stderr.flush()
- clt = process.client('sql', stdin = process.PIPE)
+ clt = process.client('sql', stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
port = int(os.getenv('MAPIPORT', '50000'))
client_load_file(clt, port, file)
- clt.communicate()
-
+ return clt.communicate()
def clients(x):
s = 0
- s += 1; srv = server_start(x,s)
- s += 1; remote_srv = remote_server_start(x,s)
+ s += 1
+ srv = server_start(x,s)
+
+ s += 1
+ remote_srv = remote_server_start(x,s)
+
c = 0
- c += 1; client(x, s, c, os.path.join(os.getenv('RELSRCDIR'), '..',
'connections_syntax.sql'))
- c += 1; client(x, s, c, os.path.join(os.getenv('RELSRCDIR'), '..',
'connections_semantic.sql'))
- c += 1; client(x, s, c, os.path.join(os.getenv('RELSRCDIR'), '..',
'connections_default_values.sql'))
- server_stop(remote_srv)
- server_stop(srv)
+
+ c += 1
+ out, err = client(x, s, c,
+ os.path.join(os.getenv('RELSRCDIR'), '..',
+ 'connections_syntax.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+ c += 1
+ out, err = client(x, s, c,
+ os.path.join(os.getenv('RELSRCDIR'), '..',
+ 'connections_semantic.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+ c += 1
+ out, err = client(x, s, c,
+ os.path.join(os.getenv('RELSRCDIR'), '..',
+ 'connections_default_values.sql'))
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+ out, err = server_stop(remote_srv)
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+ out, err = server_stop(srv)
+ sys.stdout.write(out)
+ sys.stderr.write(err)
def main():
x = 0
- x += 1; clients(x)
+ x += 1
+ clients(x)
main()
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
