Changeset: 6bbf98c0bd49 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bbf98c0bd49
Modified Files:
monetdb4/modules/plain/Tests/bat.py
monetdb4/modules/plain/Tests/tcpip1.py
monetdb4/modules/plain/Tests/tcpip2.py
monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_close_crash.SF-1042370.py
monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_hangs_on_close.SF-1070569.py
monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_crash_bat.SF-1049942.py
monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_hang.SF-1042381.py
monetdb4/tools/Tests/mclient-t-s.MIL.py
monetdb5/tools/Tests/mclient-t-s.MAL.py
pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py
pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py
pathfinder/runtime/Tests/serialization-mclient.XQUERY.py
pathfinder/src/tools/Tests/mclient-t-s.XQUERY.py
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py
pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py
pathfinder/tests/BugTracker/Tests/hang_non_existing_doc.SF-1911209.XQUERY.py
pathfinder/tests/BugTracker/Tests/mps0.py
pathfinder/tests/BugTracker/Tests/pf-O0_produces_wrong_MIL.SF-1771532.py
pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py
pathfinder/tests/BugTracker/Tests/stream-document.SF-2804823.XQUERY.py
pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
pathfinder/tests/BugTracker/Tests/update-with-timing.SF-2852928.XQUERY.py
pathfinder/tests/StandOff/StandOff.py
pathfinder/tests/StandOff/parser/Tests/so-good.py
sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
sql/benchmarks/tpch/Tests/load.SQL.py
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
sql/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.py
sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
sql/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.SQL.py
sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
sql/test/BugTracker-2010/Tests/operation-successful.Bug-2589.SQL.py
sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
sql/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
sql/test/Connections/Tests/connections.py
sql/test/Dependencies/Tests/Dependencies.SQL.py
sql/test/Dump/Tests/dump-empty.SQL.py
sql/test/Dump/Tests/dump.SQL.py
sql/test/Dump/Tests/reload.SQL.py
sql/test/Skyserver/Tests/Skyserver.SQL.py
sql/test/Skyserver/Tests/Skyserver_v6.SQL.py
sql/test/Tests/like_tests.SQL.py
sql/test/Tests/mclient-t-s.SQL.py
sql/test/Tests/null-byte-hang.SQL.py
sql/test/Tests/zones2.SQL.py
sql/test/Triggers/Tests/trigger_owner.SQL.py
sql/test/UserDump/Tests/create.SQL.py
sql/test/Users/Tests/role1.SQL.py
sql/test/Users/Tests/role2.SQL.py
sql/test/Users/Tests/table.SQL.py
sql/test/Users/Tests/unknown_user.SQL.py
sql/test/VOC/Tests/VOC.SQL.py
sql/test/Views/Tests/Views.SQL.py
sql/test/mapi/Tests/utf8test.SQL.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
Branch: Mar2011
Log Message:
makeing python test scripts work, again, with `make check`/`RunMtest`:
With `make check`/`RunMtest`, i.e., before `make install`,
<SOURCE>/testing/process.py is not yet installed in
<PREFIX>/lib/python*/site-packages/MonetDBtesting/process.py.
Thus, `from MonetDBtesting import process` does not work, yet.
In this case, we now fall back to a plain `import process`,
relying on RunMtest to extend PYTHONPATH with <SOURCE>/testing/ .
diffs (truncated from 851 to 300 lines):
diff --git a/monetdb4/modules/plain/Tests/bat.py
b/monetdb4/modules/plain/Tests/bat.py
--- a/monetdb4/modules/plain/Tests/bat.py
+++ b/monetdb4/modules/plain/Tests/bat.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
s = process.server(lang = 'mil', args = ['--set', 'gdk_mem_pagebits=16'],
stdin = open('%s.milS' % os.environ['TST']),
stdout = process.PIPE, stderr = process.PIPE)
diff --git a/monetdb4/modules/plain/Tests/tcpip1.py
b/monetdb4/modules/plain/Tests/tcpip1.py
--- a/monetdb4/modules/plain/Tests/tcpip1.py
+++ b/monetdb4/modules/plain/Tests/tcpip1.py
@@ -1,5 +1,8 @@
import os, time, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(x,dbname):
if os.name == 'nt':
diff --git a/monetdb4/modules/plain/Tests/tcpip2.py
b/monetdb4/modules/plain/Tests/tcpip2.py
--- a/monetdb4/modules/plain/Tests/tcpip2.py
+++ b/monetdb4/modules/plain/Tests/tcpip2.py
@@ -1,5 +1,8 @@
import os, time, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(dbname):
if os.name == 'nt':
diff --git
a/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_close_crash.SF-1042370.py
b/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
+++
b/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_close_crash.SF-1042370.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(dbname):
if os.name == 'nt':
diff --git
a/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_hangs_on_close.SF-1070569.py
b/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
+++
b/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_hangs_on_close.SF-1070569.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(dbname):
if os.name == 'nt':
diff --git
a/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_crash_bat.SF-1049942.py
b/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_crash_bat.SF-1049942.py
---
a/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_crash_bat.SF-1049942.py
+++
b/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_crash_bat.SF-1049942.py
@@ -1,5 +1,8 @@
import os, time, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(dbname):
if os.name == 'nt':
diff --git
a/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_hang.SF-1042381.py
b/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_hang.SF-1042381.py
--- a/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_hang.SF-1042381.py
+++ b/monetdb4/tests/BugDay_2005-11-09_4.9.3/Tests/tcpip_rpc_hang.SF-1042381.py
@@ -1,5 +1,8 @@
import os, time, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(dbname):
if os.name == 'nt':
diff --git a/monetdb4/tools/Tests/mclient-t-s.MIL.py
b/monetdb4/tools/Tests/mclient-t-s.MIL.py
--- a/monetdb4/tools/Tests/mclient-t-s.MIL.py
+++ b/monetdb4/tools/Tests/mclient-t-s.MIL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(args):
clt = process.client('mil', args = args,
diff --git a/monetdb5/tools/Tests/mclient-t-s.MAL.py
b/monetdb5/tools/Tests/mclient-t-s.MAL.py
--- a/monetdb5/tools/Tests/mclient-t-s.MAL.py
+++ b/monetdb5/tools/Tests/mclient-t-s.MAL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(args):
clt = process.client('mal', args = args,
diff --git a/pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py
b/pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py
--- a/pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py
+++ b/pathfinder/benchmarks/Music/mod/MIL/Tests/xq2mil.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
TSTSRCDIR = os.environ['TSTSRCDIR']
XQ = os.path.join('XQ','Tests')
diff --git a/pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py
b/pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py
--- a/pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py
+++ b/pathfinder/benchmarks/XMark/mod/MIL/Tests/xq2mil.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
TSTSRCDIR = os.environ['TSTSRCDIR']
XQ = os.path.join('XQ','Tests')
diff --git a/pathfinder/runtime/Tests/serialization-mclient.XQUERY.py
b/pathfinder/runtime/Tests/serialization-mclient.XQUERY.py
--- a/pathfinder/runtime/Tests/serialization-mclient.XQUERY.py
+++ b/pathfinder/runtime/Tests/serialization-mclient.XQUERY.py
@@ -1,6 +1,9 @@
import os
import sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
query = os.path.join(os.environ['TSTSRCDIR'],'serialization-query.xq')
query_no_attr =
os.path.join(os.environ['TSTSRCDIR'],'serialization-query_no_attr.xq')
diff --git a/pathfinder/src/tools/Tests/mclient-t-s.XQUERY.py
b/pathfinder/src/tools/Tests/mclient-t-s.XQUERY.py
--- a/pathfinder/src/tools/Tests/mclient-t-s.XQUERY.py
+++ b/pathfinder/src/tools/Tests/mclient-t-s.XQUERY.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(args):
clt = process.client('xquery', args = args,
diff --git
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py
b/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
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
# create a temporary document
fn = os.path.join(os.getenv('TSTTRGBASE'), 'testdoc.xml')
diff --git
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py
b/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
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
srv = process.server('mil',
dbinit =
'module(pathfinder);module(sql_server);mil_start();',
diff --git
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py
b/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
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def server_start(x,s,dbinit):
sys.stdout.write('\nserver %d%d : "%s"\n' % (x,s,dbinit))
diff --git
a/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py
b/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
+++
b/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
fn = os.path.join(os.getenv('TSTSRCDIR'), 'test1377006.xml')
p = process.client('xquery', stdin = process.PIPE, stdout = process.PIPE,
diff --git
a/pathfinder/tests/BugTracker/Tests/hang_non_existing_doc.SF-1911209.XQUERY.py
b/pathfinder/tests/BugTracker/Tests/hang_non_existing_doc.SF-1911209.XQUERY.py
---
a/pathfinder/tests/BugTracker/Tests/hang_non_existing_doc.SF-1911209.XQUERY.py
+++
b/pathfinder/tests/BugTracker/Tests/hang_non_existing_doc.SF-1911209.XQUERY.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(lang, args, input = None):
clt = process.client(lang, args = args,
diff --git a/pathfinder/tests/BugTracker/Tests/mps0.py
b/pathfinder/tests/BugTracker/Tests/mps0.py
--- a/pathfinder/tests/BugTracker/Tests/mps0.py
+++ b/pathfinder/tests/BugTracker/Tests/mps0.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
pf = process.pf(args = ['-M', '%s.xq' % os.environ['TST']],
stdout = process.PIPE, stderr = process.PIPE, log = True)
diff --git
a/pathfinder/tests/BugTracker/Tests/pf-O0_produces_wrong_MIL.SF-1771532.py
b/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
+++ b/pathfinder/tests/BugTracker/Tests/pf-O0_produces_wrong_MIL.SF-1771532.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
pf = process.pf(args = ['-O0', '%s.xq' % os.environ['TST']],
stdout = process.PIPE, stderr = process.PIPE, log = True)
diff --git a/pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py
b/pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py
--- a/pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py
+++ b/pathfinder/tests/BugTracker/Tests/port_busy.SF-1809586.py
@@ -1,5 +1,8 @@
import os, sys, socket
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def prog(dbinit, input):
sys.stdout.write("%s\n" % dbinit)
diff --git
a/pathfinder/tests/BugTracker/Tests/stream-document.SF-2804823.XQUERY.py
b/pathfinder/tests/BugTracker/Tests/stream-document.SF-2804823.XQUERY.py
--- a/pathfinder/tests/BugTracker/Tests/stream-document.SF-2804823.XQUERY.py
+++ b/pathfinder/tests/BugTracker/Tests/stream-document.SF-2804823.XQUERY.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
def client(lang, args, input = None):
clt = process.client(lang, args,
diff --git
a/pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
b/pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
--- a/pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
+++ b/pathfinder/tests/BugTracker/Tests/update-stress.SF-1896755.XQUERY.py
@@ -1,5 +1,8 @@
import os, sys
-from MonetDBtesting import process
+try:
+ from MonetDBtesting import process
+except ImportError:
+ 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)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
