Update of /cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6386/tests/BugDay_2005-12-19_0.9.3/Tests
Modified Files:
Tag: Nov2009
file_locked_after_shredding.SF-1238352.MIL.py
multiple_servers.SF-1385152.py
multiple_servers_2.SF-1385152.py
shredding_on_the_fly.SF-1377006.XQUERY.py
Log Message:
Get rid of our own copy of subprocess.py. We now require a Python version >=
2.4.
U file_locked_after_shredding.SF-1238352.MIL.py
Index: file_locked_after_shredding.SF-1238352.MIL.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/file_locked_after_shredding.SF-1238352.MIL.py,v
retrieving revision 1.2.26.1
retrieving revision 1.2.26.2
diff -u -d -r1.2.26.1 -r1.2.26.2
--- file_locked_after_shredding.SF-1238352.MIL.py 12 Oct 2009 15:20:31
-0000 1.2.26.1
+++ file_locked_after_shredding.SF-1238352.MIL.py 12 Oct 2009 15:36:08
-0000 1.2.26.2
@@ -1,9 +1,5 @@
import os
-try:
- import subprocess
-except ImportError:
- # user private copy for old Python versions
- import MonetDBtesting.subprocess26 as subprocess
+import subprocess
def main():
# create a temporary document
U multiple_servers_2.SF-1385152.py
Index: multiple_servers_2.SF-1385152.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers_2.SF-1385152.py,v
retrieving revision 1.7.24.1
retrieving revision 1.7.24.2
diff -u -d -r1.7.24.1 -r1.7.24.2
--- multiple_servers_2.SF-1385152.py 12 Oct 2009 15:20:39 -0000 1.7.24.1
+++ multiple_servers_2.SF-1385152.py 12 Oct 2009 15:36:08 -0000 1.7.24.2
@@ -1,9 +1,5 @@
import os, time, sys
-try:
- import subprocess
-except ImportError:
- # user private copy for old Python versions
- import MonetDBtesting.subprocess26 as subprocess
+import subprocess
def server_start(x,s,dbinit):
srvcmd = '%s --dbname "%s" --dbinit "%s"' %
(os.getenv('MSERVER'),os.getenv('TSTDB'),dbinit)
U shredding_on_the_fly.SF-1377006.XQUERY.py
Index: shredding_on_the_fly.SF-1377006.XQUERY.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/shredding_on_the_fly.SF-1377006.XQUERY.py,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -d -r1.2.4.1 -r1.2.4.2
--- shredding_on_the_fly.SF-1377006.XQUERY.py 12 Oct 2009 15:20:44 -0000
1.2.4.1
+++ shredding_on_the_fly.SF-1377006.XQUERY.py 12 Oct 2009 15:36:08 -0000
1.2.4.2
@@ -1,9 +1,5 @@
import os
-try:
- import subprocess
-except ImportError:
- # user private copy for old Python versions
- import MonetDBtesting.subprocess26 as subprocess
+import subprocess
def main():
fn = os.path.join(os.getenv('TSTSRCDIR'), 'test1377006.xml')
U multiple_servers.SF-1385152.py
Index: multiple_servers.SF-1385152.py
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/multiple_servers.SF-1385152.py,v
retrieving revision 1.7.24.1
retrieving revision 1.7.24.2
diff -u -d -r1.7.24.1 -r1.7.24.2
--- multiple_servers.SF-1385152.py 12 Oct 2009 15:20:35 -0000 1.7.24.1
+++ multiple_servers.SF-1385152.py 12 Oct 2009 15:36:08 -0000 1.7.24.2
@@ -1,9 +1,5 @@
import os, time
-try:
- import subprocess
-except ImportError:
- # user private copy for old Python versions
- import MonetDBtesting.subprocess26 as subprocess
+import subprocess
def main():
srvcmd = '%s --set mapi_port=%s --dbinit
"module(pathfinder);module(sql_server);mil_start();"' %
(os.getenv('MSERVER'),os.getenv('MAPIPORT'))
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
