Could someone test this on Windows, please? I suspect read_wc_formats() (added in r1899012) returns paths with os.sep, but the expectations added in this commit use '/', so something will need to convert.
Thanks, Daniel danie...@apache.org wrote on Fri, 18 Mar 2022 00:40 +00:00: > Author: danielsh > Date: Fri Mar 18 00:40:29 2022 > New Revision: 1899014 > > URL: http://svn.apache.org/viewvc?rev=1899014&view=rev > Log: > * subversion/tests/cmdline/upgrade_tests.py > (upgrade_with_externals): Verify format numbers of upgraded externals. > (check_formats): New. > (check_format): Verify the argument type to guard against typos. > > 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=1899014&r1=1899013&r2=1899014&view=diff > ============================================================================== > --- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original) > +++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Mar 18 > 00:40:29 2022 > @@ -102,11 +102,21 @@ def replace_sbox_repo_with_tarfile(sbox, > shutil.move(os.path.join(extract_dir, dir), sbox.repo_dir) > > def check_format(sbox, expected_format): > + assert isinstance(expected_format, int) > formats = sbox.read_wc_formats() > if formats[''] != expected_format: > raise svntest.Failure("found format '%d'; expected '%d'; in wc '%s'" % > (formats[''], expected_format, sbox.wc_dir)) > > +def check_formats(sbox, expected_formats): > + assert isinstance(expected_formats, dict) > + formats = sbox.read_wc_formats() > + ### If we ever need better error messages here, reuse > run_and_verify_info(). > + if formats != expected_formats: > + raise svntest.Failure("found format '%s'; expected '%s'; in wc '%s'" % > + (formats, expected_formats, sbox.wc_dir)) > + > + > def check_pristine(sbox, files): > for file in files: > file_path = sbox.ospath(file) > @@ -334,7 +344,18 @@ def upgrade_with_externals(sbox): > 'upgrade', sbox.wc_dir) > > # Actually check the format number of the upgraded working copy > - check_format(sbox, get_current_format()) > + check_formats(sbox, > + {relpath: get_current_format() > + for relpath in ( > + '', > + 'A/D/exdir_A', > + 'A/D/exdir_A/G', > + 'A/D/exdir_A/H', > + 'A/D/x', > + 'A/C/exdir_G', > + 'A/C/exdir_H', > + )}) > + > check_pristine(sbox, ['iota', 'A/mu', > 'A/D/x/lambda', 'A/D/x/E/alpha'])
