You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2022/03/18 00:43:05 UTC
Re: svn commit: r1899014 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
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
danielsh@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'])
Re: svn commit: r1899014 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Posted by Jun Omae <ju...@gmail.com>.
On Fri, Mar 18, 2022 at 12:01 PM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
>
> Jun Omae wrote on Fri, Mar 18, 2022 at 11:27:16 +0900:
> > Hi,
> >
> > On Fri, Mar 18, 2022 at 9:44 AM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> > >
> > > 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
> >
> > I got 3 failures from testing r1899017 on Windows. dav-tests.log is attached.
> > See also https://github.com/jun66j5/subversion/runs/5594602036?check_suite_focus=true#step:7:2816
> >
>
> Thank you!
>
> Does r1899019 fix this?
(resend to dev@...)
Yeah, the failures go away on tests for r1899019.
[[[
Summary of test results:
2593 tests PASSED
127 tests SKIPPED
77 tests XFAILED (17 WORK-IN-PROGRESS)
Python version: 3.7.9.
SUMMARY: All tests successful
]]]
https://github.com/jun66j5/subversion/runs/5595682577?check_suite_focus=true#step:7:2816
--
Jun Omae <ju...@gmail.com> (大前 潤)
Re: svn commit: r1899014 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Jun Omae wrote on Fri, Mar 18, 2022 at 11:27:16 +0900:
> Hi,
>
> On Fri, Mar 18, 2022 at 9:44 AM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> >
> > 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
>
> I got 3 failures from testing r1899017 on Windows. dav-tests.log is attached.
> See also https://github.com/jun66j5/subversion/runs/5594602036?check_suite_focus=true#step:7:2816
>
Thank you!
Does r1899019 fix this?
Re: svn commit: r1899014 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Jun Omae wrote on Fri, Mar 18, 2022 at 11:27:16 +0900:
> Hi,
>
> On Fri, Mar 18, 2022 at 9:44 AM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> >
> > 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
>
> I got 3 failures from testing r1899017 on Windows. dav-tests.log is attached.
> See also https://github.com/jun66j5/subversion/runs/5594602036?check_suite_focus=true#step:7:2816
>
Thank you!
Does r1899019 fix this?
Re: svn commit: r1899014 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Posted by Jun Omae <ju...@gmail.com>.
Hi,
On Fri, Mar 18, 2022 at 9:44 AM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
>
> 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
I got 3 failures from testing r1899017 on Windows. dav-tests.log is attached.
See also https://github.com/jun66j5/subversion/runs/5594602036?check_suite_focus=true#step:7:2816
[[[
FAIL: upgrade_tests.py 2: upgrade with externals
FAIL: upgrade_tests.py 7: test upgrading a working copy created with 1.0.0
FAIL: upgrade_tests.py 35: test upgrading 1.0.0 working copy with externals
Summary of test results:
2590 tests PASSED
127 tests SKIPPED
77 tests XFAILED (17 WORK-IN-PROGRESS)
3 tests FAILED
Python version: 3.7.9.
SUMMARY: Some tests failed
]]]
The build uses the following libraries:
[[[
Found apr 1.6.5
Found apr-util 1.6.1
Found apr_memcache 1.6.1
Found expat 2.4.1
Found httpd 2.4.52
Found libintl 0.21.0
Found mod_dav 2.4.52
Found openssl 1.1.1m
Found perl 5.32.1
Found ruby 2.5.0
Found serf 1.4.0
Found sqlite 3.38.1
Found swig 4.0.2
Found zlib 1.2.11
Using bundled lz4 1.7.5
Using bundled utf8proc 2.1.0
]]]
--
Jun Omae <ju...@gmail.com> (大前 潤)
Re: svn commit: r1899014 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Posted by Jun Omae <ju...@gmail.com>.
Hi,
On Fri, Mar 18, 2022 at 9:44 AM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
>
> 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
I got 3 failures from testing r1899017 on Windows. dav-tests.log is attached.
See also https://github.com/jun66j5/subversion/runs/5594602036?check_suite_focus=true#step:7:2816
[[[
FAIL: upgrade_tests.py 2: upgrade with externals
FAIL: upgrade_tests.py 7: test upgrading a working copy created with 1.0.0
FAIL: upgrade_tests.py 35: test upgrading 1.0.0 working copy with externals
Summary of test results:
2590 tests PASSED
127 tests SKIPPED
77 tests XFAILED (17 WORK-IN-PROGRESS)
3 tests FAILED
Python version: 3.7.9.
SUMMARY: Some tests failed
]]]
The build uses the following libraries:
[[[
Found apr 1.6.5
Found apr-util 1.6.1
Found apr_memcache 1.6.1
Found expat 2.4.1
Found httpd 2.4.52
Found libintl 0.21.0
Found mod_dav 2.4.52
Found openssl 1.1.1m
Found perl 5.32.1
Found ruby 2.5.0
Found serf 1.4.0
Found sqlite 3.38.1
Found swig 4.0.2
Found zlib 1.2.11
Using bundled lz4 1.7.5
Using bundled utf8proc 2.1.0
]]]
--
Jun Omae <ju...@gmail.com> (大前 潤)