You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/29 12:33:26 UTC
svn commit: r1097760 -
/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Author: rhuijben
Date: Fri Apr 29 10:33:25 2011
New Revision: 1097760
URL: http://svn.apache.org/viewvc?rev=1097760&view=rev
Log:
Try to fix a buildbot failure where python's builtin sqlite doesn't like our
wc.db.
* subversion/tests/cmdline/upgrade_tests.py
(check_dav_cache): Don't try to read using old SQLite versions.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1097760&r1=1097759&r2=1097760&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Apr 29 10:33:25 2011
@@ -106,8 +106,22 @@ def check_pristine(sbox, files):
def check_dav_cache(dir_path, wc_id, expected_dav_caches):
dot_svn = svntest.main.get_admin_name()
db = svntest.sqlite3.connect(os.path.join(dir_path, dot_svn, 'wc.db'))
+
c = db.cursor()
+ # Check if python's sqlite can read our db
+ c.execute('select sqlite_version()')
+ sqlite_ver = map(int, c.fetchone()[0].split('.'))
+
+ # SQLite versions have 3 or 4 number groups
+ major = sqlite_ver[0]
+ minor = sqlite_ver[1]
+ patch = sqlite_ver[2]
+
+ if major < 3 or (major == 3 and minor < 6) \
+ or (major == 3 and minor == 6 and patch < 18):
+ return # We need a newer SQLite
+
for local_relpath, expected_dav_cache in expected_dav_caches.items():
# NODES conversion is complete enough that we can use it if it exists
c.execute("""pragma table_info(nodes)""")
Re: svn commit: r1097760 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2011-04-29 12:33:26 rhuijben@apache.org napisał(a):
> Author: rhuijben
> Date: Fri Apr 29 10:33:25 2011
> New Revision: 1097760
>
> URL: http://svn.apache.org/viewvc?rev=1097760&view=rev
> Log:
> Try to fix a buildbot failure where python's builtin sqlite doesn't like our
> wc.db.
>
> * subversion/tests/cmdline/upgrade_tests.py
> (check_dav_cache): Don't try to read using old SQLite versions.
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1097760&r1=1097759&r2=1097760&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Apr 29 10:33:25 2011
> @@ -106,8 +106,22 @@ def check_pristine(sbox, files):
> def check_dav_cache(dir_path, wc_id, expected_dav_caches):
> dot_svn = svntest.main.get_admin_name()
> db = svntest.sqlite3.connect(os.path.join(dir_path, dot_svn, 'wc.db'))
> +
> c = db.cursor()
>
> + # Check if python's sqlite can read our db
> + c.execute('select sqlite_version()')
> + sqlite_ver = map(int, c.fetchone()[0].split('.'))
> +
> + # SQLite versions have 3 or 4 number groups
> + major = sqlite_ver[0]
> + minor = sqlite_ver[1]
> + patch = sqlite_ver[2]
> +
> + if major < 3 or (major == 3 and minor < 6) \
> + or (major == 3 and minor == 6 and patch < 18):
> + return # We need a newer SQLite
sqlite_ver = tuple(int(x) for x in svntest.sqlite3.sqlite_version.split('.'))
if sqlite_ver < (3, 6, 18):
return
--
Arfrever Frehtes Taifersar Arahesis