Changeset: 958133a57847 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=958133a57847
Modified Files:
sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
Branch: Oct2010
Log Message:
Simplify test scripts.
The process module waits for the server to start up, so we don't have
to do it here.
diffs (214 lines):
diff -r 073b68dc838b -r 958133a57847
sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
--- a/sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
Tue Oct 26 17:03:14 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
Tue Oct 26 17:06:09 2010 +0200
@@ -2,28 +2,6 @@
import os
from MonetDBtesting import process
-def server():
- s = process.server('sql', args = ["--set", "gdk_readonly=yes"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
-def server_stop(s):
- out, err = s.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
-
def client(input):
c = process.client('sql',
stdin = process.PIPE,
@@ -38,9 +16,14 @@
'''
def main():
- s = server()
+ s = process.server('sql', args = ["--set", "gdk_readonly=yes"],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script1)
- server_stop(s)
+ out, err = s.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
if __name__ == '__main__':
main()
diff -r 073b68dc838b -r 958133a57847
sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
--- a/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py Tue Oct
26 17:03:14 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py Tue Oct
26 17:06:09 2010 +0200
@@ -4,21 +4,10 @@
from MonetDBtesting import process
def server():
- s = process.server('sql',
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
+ return process.server('sql',
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
def server_stop(s):
out, err = s.communicate()
diff -r 073b68dc838b -r 958133a57847
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
--- a/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
Tue Oct 26 17:03:14 2010 +0200
+++ b/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
Tue Oct 26 17:06:09 2010 +0200
@@ -2,40 +2,6 @@
import os
from MonetDBtesting import process
-def server_readonly():
- s = process.server('sql', args = ["--readonly"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
-def server():
- s = process.server('sql', args = [],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
def server_stop(s):
out, err = s.communicate()
sys.stdout.write(out)
@@ -106,14 +72,20 @@
'''
def main():
- s = server()
+ s = process.server('sql', args = [],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script1)
client(script3)
client(script4)
client(script2)
client(script5)
server_stop(s)
- s = server_readonly()
+ s = process.server('sql', args = ["--readonly"],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script8)
client(script4)
client(script2)
diff -r 073b68dc838b -r 958133a57847
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
--- a/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
Tue Oct 26 17:03:14 2010 +0200
+++ b/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
Tue Oct 26 17:06:09 2010 +0200
@@ -1,41 +1,6 @@
import sys
-import os
from MonetDBtesting import process
-def server_readonly():
- s = process.server('sql', args = ["--readonly"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
-def server():
- s = process.server('sql', args = [],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
def server_stop(s):
out, err = s.communicate()
sys.stdout.write(out)
@@ -99,7 +64,10 @@
'''
def main():
- s = server()
+ s = process.server('sql', args = [],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script1)
client(script2)
client(script3)
@@ -108,7 +76,10 @@
client(script11)
client(script12)
server_stop(s)
- s = server_readonly()
+ s = process.server('sql', args = ["--readonly"],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script1)
client(script3)
client(script6)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
