Changeset: 5955d290be91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5955d290be91
Modified Files:
pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.sh
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (truncated from 1393 to 300 lines):
diff -r d7b5d55ac063 -r 5955d290be91
MonetDB4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_close_crash.SF-1042370.py
---
a/MonetDB4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_close_crash.SF-1042370.py
Thu Sep 30 10:22:09 2010 +0200
+++
b/MonetDB4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_close_crash.SF-1042370.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,4 +1,4 @@
-import os, time, sys
+import os, sys
from MonetDBtesting import process
def server_start(dbname):
diff -r d7b5d55ac063 -r 5955d290be91
MonetDB4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_hangs_on_close.SF-1070569.py
---
a/MonetDB4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_hangs_on_close.SF-1070569.py
Thu Sep 30 10:22:09 2010 +0200
+++
b/MonetDB4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_hangs_on_close.SF-1070569.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,4 +1,4 @@
-import os, time, sys
+import os, sys
from MonetDBtesting import process
def server_start(dbname):
@@ -54,7 +54,6 @@
x = 0
x += 1; srv1 = server_start("db" + str(x))
x += 1; srv2 = server_start("db" + str(x))
- time.sleep(1) # give servers time to start
srv1.stdin.write(prelude_1)
srv2.stdin.write(prelude_2)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py
--- a/pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py Thu Sep 30
10:22:09 2010 +0200
+++ b/pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py Thu Sep 30
15:08:10 2010 +0200
@@ -1,4 +1,4 @@
-import os
+import os, sys
from MonetDBtesting import process
TSTSRCDIR = os.environ['TSTSRCDIR']
@@ -7,5 +7,8 @@
pf = process.pf(args = ['-M', '%s.xq' % os.path.join(TSTSRCDIR.replace(MIL,XQ),
'music')],
- stdout = open('music.mil', 'w'), log = True)
-pf.communicate()
+ stdout = open('music.mil', 'w'),
+ stderr = process.PIPE,
+ log = True)
+out, err = pf.communicate()
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py
--- a/pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py Thu Sep 30
10:22:09 2010 +0200
+++ b/pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py Thu Sep 30
15:08:10 2010 +0200
@@ -1,4 +1,4 @@
-import os
+import os, sys
from MonetDBtesting import process
TSTSRCDIR = os.environ['TSTSRCDIR']
@@ -7,5 +7,8 @@
pf = process.pf(args = ['-M', '%s.xq' % os.path.join(TSTSRCDIR.replace(MIL,XQ),
'xmark')],
- stdout = open('xmark.mil', 'w'), log = True)
-pf.communicate()
+ stdout = open('xmark.mil', 'w'),
+ stderr = process.PIPE,
+ log = True)
+out, err = pf.communicate()
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py
---
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py
Thu Sep 30 10:22:09 2010 +0200
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,20 +1,19 @@
-import os
+import os, sys
from MonetDBtesting import process
-def main():
- # create a temporary document
- fn = os.path.join(os.getenv('TSTTRGBASE'), 'testdoc.xml')
- f = open(fn,'w')
- f.write('<testdoc><content/></testdoc>\n')
- f.close()
- # shred it
- p = process.client('mil', stdin = process.PIPE)
- p.stdin.write('module("pathfinder");\n')
- p.stdin.write('shred_doc("%s", "testdoc.xml");\n' % fn.replace('\\',
r'\\'))
- p.communicate()
- # Here's the real test: try unlinking the source document while
- # the server is still running. If the unlink fails, we get a
- # traceback which should be caught by Mtest
- os.unlink(fn)
-
-main()
+# create a temporary document
+fn = os.path.join(os.getenv('TSTTRGBASE'), 'testdoc.xml')
+f = open(fn,'w')
+f.write('<testdoc><content/></testdoc>\n')
+f.close()
+# shred it
+p = process.client('mil', stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
+out, err = p.communicate('module("pathfinder");\n'
+ 'shred_doc("%s", "testdoc.xml");\n' %
fn.replace('\\', r'\\'))
+sys.stdout.write(out)
+sys.stderr.write(err)
+# Here's the real test: try unlinking the source document while
+# the server is still running. If the unlink fails, we get a
+# traceback which should be caught by Mtest
+os.unlink(fn)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py
---
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py
Thu Sep 30 10:22:09 2010 +0200
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,13 +1,14 @@
-import os, time
+import os, sys
from MonetDBtesting import process
-def main():
- srv = process.server('mil',
- dbinit =
'module(pathfinder);module(sql_server);mil_start();',
- stdin = process.PIPE)
- time.sleep(10) # give server time to start
- clt = process.client('mil', stdin = process.PIPE)
- clt.communicate()
- srv.communicate()
-
-main()
+srv = process.server('mil',
+ dbinit =
'module(pathfinder);module(sql_server);mil_start();',
+ stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
+clt = process.client('mil', stdout = process.PIPE, stderr = process.PIPE)
+out, err = clt.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py
---
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py
Thu Sep 30 10:22:09 2010 +0200
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,4 +1,4 @@
-import os, time, sys
+import os, sys
from MonetDBtesting import process
def server_start(x,s,dbinit):
@@ -6,20 +6,25 @@
sys.stderr.write('\nserver %d%d : "%s"\n' % (x,s,dbinit))
sys.stdout.flush()
sys.stderr.flush()
- srv = process.server('mil', dbinit = dbinit, stdin = process.PIPE)
- time.sleep(5) # give server time to start
+ srv = process.server('mil', dbinit = dbinit, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
return srv
def server_stop(srv):
- srv.communicate()
+ out, err = srv.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
def client(x,s, c, dbinit, lang, cmd, h):
sys.stdout.write('\nserver %d%d : "%s", client %d: %s%s\n' %
(x,s,dbinit,c,h,lang))
sys.stderr.write('\nserver %d%d : "%s", client %d: %s%s\n' %
(x,s,dbinit,c,h,lang))
sys.stdout.flush()
sys.stderr.flush()
- clt = process.client(lang, stdin = process.PIPE)
- clt.communicate(cmd)
+ clt = process.client(lang, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
+ out, err = clt.communicate(cmd)
+ sys.stdout.write(out)
+ sys.stderr.write(err)
return '%s(%s) ' % (h,lang)
def clients(x,dbinit):
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py
---
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py
Thu Sep 30 10:22:09 2010 +0200
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,9 +1,9 @@
-import os
+import os, sys
from MonetDBtesting import process
-def main():
- fn = os.path.join(os.getenv('TSTSRCDIR'), 'test1377006.xml')
- p = process.client('xquery', stdin = process.PIPE)
- p.communicate('doc("%s")/x' % fn)
-
-main()
+fn = os.path.join(os.getenv('TSTSRCDIR'), 'test1377006.xml')
+p = process.client('xquery', stdin = process.PIPE, stdout = process.PIPE,
+ stderr = process.PIPE)
+out, err = p.communicate('doc("%s")/x' % fn)
+sys.stdout.write(out)
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91 pathfinder/tests/BugTracker/Tests/mps0.py
--- a/pathfinder/tests/BugTracker/Tests/mps0.py Thu Sep 30 10:22:09 2010 +0200
+++ b/pathfinder/tests/BugTracker/Tests/mps0.py Thu Sep 30 15:08:10 2010 +0200
@@ -1,10 +1,16 @@
-import os
+import os, sys
from MonetDBtesting import process
pf = process.pf(args = ['-M', '%s.xq' % os.environ['TST']],
- stdout = process.PIPE, log = True)
+ stdout = process.PIPE, stderr = process.PIPE, log = True)
srv = process.server(lang = 'xquery',
dbinit = 'module(pathfinder);
debugmask(and(debugmask(),xor(INT_MAX,8+2)));',
- stdin = pf.stdout, log = True, notrace = True)
-pf.communicate()
-srv.communicate()
+ stdin = pf.stdout,
+ stdout = process.PIPE, stderr = process.PIPE,
+ log = True, notrace = True)
+pf.stdout = None # given away
+out, err = pf.communicate()
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugTracker/Tests/pf-O0_produces_wrong_MIL.SF-1771532.py
--- a/pathfinder/tests/BugTracker/Tests/pf-O0_produces_wrong_MIL.SF-1771532.py
Thu Sep 30 10:22:09 2010 +0200
+++ b/pathfinder/tests/BugTracker/Tests/pf-O0_produces_wrong_MIL.SF-1771532.py
Thu Sep 30 15:08:10 2010 +0200
@@ -1,9 +1,14 @@
-import os
+import os, sys
from MonetDBtesting import process
pf = process.pf(args = ['-O0', '%s.xq' % os.environ['TST']],
- stdout = process.PIPE, log = True)
+ stdout = process.PIPE, stderr = process.PIPE, log = True)
srv = process.server(lang = 'xquery', stdin = pf.stdout,
+ stdout = process.PIPE, stderr = process.PIPE,
log = True, notrace = True)
-pf.communicate()
-srv.communicate()
+pf.stdout = None # given away
+out, err = pf.communicate()
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py
--- a/pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py Thu Sep 30
10:22:09 2010 +0200
+++ b/pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py Thu Sep 30
15:08:10 2010 +0200
@@ -1,4 +1,4 @@
-import os, sys, socket, time
+import os, sys, socket
from MonetDBtesting import process
def prog(dbinit, input):
@@ -8,7 +8,6 @@
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
- time.sleep(2)
out, err = srv.communicate(input)
sys.stdout.write(out)
sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
Thu Sep 30 15:08:10 2010 +0200
@@ -0,0 +1,25 @@
+import os, sys
+from MonetDBtesting import process
+
+f = os.path.join(os.environ['TSTSRCDIR'], 'update-stress.SF-1896755.xml')
+c = process.client(lang = 'xquery', args = ['-s',
'pf:add-doc("%s","update-stress.SF-1896755.xml",10)' % f], stdout =
process.PIPE, stderr = process.PIPE)
+out, err = c.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+f = os.path.join(os.environ['TSTSRCDIR'], 'update-stress.SF-1896755-xq')
+c1 = process.client(lang = 'xquery', args = [f],
+ stdout = process.PIPE, stderr = process.PIPE)
+c2 = process.client(lang = 'xquery', args = [f],
+ stdout = process.PIPE, stderr = process.PIPE)
+c3 = process.client(lang = 'xquery', args = [f],
+ stdout = process.PIPE, stderr = process.PIPE)
+out, err = c1.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = c2.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = c3.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
diff -r d7b5d55ac063 -r 5955d290be91
pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.sh
--- a/pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.sh
Thu Sep 30 10:22:09 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$XQUERYCLIENT -s
"pf:add-doc(\"$TSTSRCDIR/update-stress.SF-1896755.xml\",\"update-stress.SF-1896755.xml\",10)"
-$XQUERYCLIENT $TSTSRCDIR/update-stress.SF-1896755-xq &
-$XQUERYCLIENT $TSTSRCDIR/update-stress.SF-1896755-xq &
-$XQUERYCLIENT $TSTSRCDIR/update-stress.SF-1896755-xq &
-wait
diff -r d7b5d55ac063 -r 5955d290be91 pathfinder/tests/StandOff/StandOff.py
--- a/pathfinder/tests/StandOff/StandOff.py Thu Sep 30 10:22:09 2010 +0200
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
