Author: svn-role
Date: Fri Sep 13 04:00:14 2024
New Revision: 1920605
URL: http://svn.apache.org/viewvc?rev=1920605&view=rev
Log:
Merge r1910464 from trunk:
* r1910464
Fix svnadmin_tests.py (build_repcache) failing with Python 3.11+ on
Windows.
Justification:
Make unit tests to pass with the latest version of Python on Windows.
votes:
+1: jun66j5, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/svnadmin_tests.py
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1910464
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1920605&r1=1920604&r2=1920605&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Sep 13 04:00:14 2024
@@ -27,11 +27,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1910464
- Fix svnadmin_tests.py (build_repcache) failing with Python 3.11+ on
- Windows.
- Justification:
- Make unit tests to pass with the latest version of Python on Windows.
- votes:
- +1: jun66j5, jcorvel
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/svnadmin_tests.py?rev=1920605&r1=1920604&r2=1920605&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/svnadmin_tests.py Fri
Sep 13 04:00:14 2024
@@ -58,17 +58,20 @@ def read_rep_cache(repo_dir):
"""
db_path = os.path.join(repo_dir, 'db', 'rep-cache.db')
db1 = svntest.sqlite3.connect(db_path)
- schema1 = db1.execute("pragma user_version").fetchone()[0]
- # Can't test newer rep-cache schemas with an old built-in SQLite; see the
- # documentation of STMT_CREATE_SCHEMA_V2 in
../../libsvn_fs_fs/rep-cache-db.sql
- if schema1 >= 2 and svntest.sqlite3.sqlite_version_info < (3, 8, 2):
- raise svntest.Failure("Can't read rep-cache schema %d using old "
- "Python-SQLite version %s < (3,8,2)" %
- (schema1,
- svntest.sqlite3.sqlite_version_info))
+ try:
+ schema1 = db1.execute("pragma user_version").fetchone()[0]
+ # Can't test newer rep-cache schemas with an old built-in SQLite; see the
+ # documentation of STMT_CREATE_SCHEMA_V2 in
../../libsvn_fs_fs/rep-cache-db.sql
+ if schema1 >= 2 and svntest.sqlite3.sqlite_version_info < (3, 8, 2):
+ raise svntest.Failure("Can't read rep-cache schema %d using old "
+ "Python-SQLite version %s < (3,8,2)" %
+ (schema1,
+ svntest.sqlite3.sqlite_version_info))
- content = { row[0]: row[1:] for row in
- db1.execute("select * from rep_cache") }
+ content = { row[0]: row[1:] for row in
+ db1.execute("select * from rep_cache") }
+ finally:
+ db1.close()
return content
def check_hotcopy_bdb(src, dst):
