Author: julianfoad
Date: Wed Mar 2 21:18:27 2022
New Revision: 1898537
URL: http://svn.apache.org/viewvc?rev=1898537&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: sync with trunk@1898536.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1898532-1898536
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests.py?rev=1898537&r1=1898536&r2=1898537&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests.py
Wed Mar 2 21:18:27 2022
@@ -99,10 +99,6 @@ rep_lines_res = [
# In 'svn --version --quiet', we print only the version
# number in a single line.
(re.compile(r'^\d+\.\d+\.\d+(-[a-zA-Z0-9]+)?$'), 'X.Y.Z\n'),
-
- # In svn --version, the supported WC versions vary.
- (re.compile(r'^Supported working copy (WC) version.*$'),
- 'Supported working copy (WC) versions: from X.Y to X.Y')
]
# This is a trigger pattern that selects the secondary set of
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/sandbox.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/sandbox.py?rev=1898537&r1=1898536&r2=1898537&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/sandbox.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/sandbox.py
Wed Mar 2 21:18:27 2022
@@ -600,6 +600,15 @@ class Sandbox:
self.read_only and "true" or "false"))
pass
+ def read_wc_format(self):
+ dot_svn = svntest.main.get_admin_name()
+ db = svntest.sqlite3.connect(os.path.join(self.wc_dir, dot_svn, 'wc.db'))
+ c = db.cursor()
+ c.execute('pragma user_version;')
+ found_format = c.fetchone()[0]
+ db.close()
+ return found_format
+
def is_url(target):
return (target.startswith('^/')
or target.startswith('file://')
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py?rev=1898537&r1=1898536&r2=1898537&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Wed Mar 2 21:18:27 2022
@@ -97,22 +97,10 @@ def replace_sbox_repo_with_tarfile(sbox,
shutil.move(os.path.join(extract_dir, dir), sbox.repo_dir)
def check_format(sbox, expected_format):
- dot_svn = svntest.main.get_admin_name()
- for root, dirs, files in os.walk(sbox.wc_dir):
- db = svntest.sqlite3.connect(os.path.join(root, dot_svn, 'wc.db'))
- c = db.cursor()
- c.execute('pragma user_version;')
- found_format = c.fetchone()[0]
- db.close()
-
- if found_format != expected_format:
- raise svntest.Failure("found format '%d'; expected '%d'; in wc '%s'" %
- (found_format, expected_format, root))
-
- dirs[:] = []
-
- if dot_svn in dirs:
- dirs.remove(dot_svn)
+ found_format = sbox.read_wc_format()
+ if found_format != expected_format:
+ raise svntest.Failure("found format '%d'; expected '%d'; in wc '%s'" %
+ (found_format, expected_format, sbox.wc_dir))
def check_pristine(sbox, files):
for file in files:
