Author: rhuijben
Date: Thu Mar 5 23:39:29 2015
New Revision: 1664527
URL: http://svn.apache.org/r1664527
Log:
Fix the direct db relocate in upgrade_tests.py 36.
* subversion/tests/cmdline/svntest/wc.py
(sqlite_exec): New function.
* subversion/tests/cmdline/upgrade_tests.py
(auto_analyze): Use function that commits.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1664527&r1=1664526&r2=1664527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Thu Mar 5 23:39:29
2015
@@ -1035,6 +1035,16 @@ def sqlite_stmt(wc_root_path, stmt):
c.execute(stmt)
return c.fetchall()
+def sqlite_exec(wc_root_path, stmt):
+ """Execute STMT on the SQLite wc.db in WC_ROOT_PATH and return the
+ results."""
+
+ db = open_wc_db(wc_root_path)[0]
+ c = db.cursor()
+ c.execute(stmt)
+ db.commit()
+
+
# ------------
### probably toss these at some point. or major rework. or something.
### just bootstrapping some changes for now.
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1664527&r1=1664526&r2=1664527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Mar 5
23:39:29 2015
@@ -1448,7 +1448,7 @@ def auto_analyze(sbox):
'52ec7e4b-e5f0-451d-829f-f05d5571b4ab')
# Don't use svn to do relocate as that will add the table.
- val = svntest.wc.sqlite_stmt(sbox.wc_dir,
+ val = svntest.wc.sqlite_exec(sbox.wc_dir,
"update repository "
"set root ='" + sbox.repo_url + "'");
