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/01/25 12:22:10 UTC
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
> Add a test for issue #4856, "invalid xml file produced by: svn log --xml
> --use-merge-history".
⋮
> * subversion/tests/cmdline/log_tests.py
> (log_xml_with_merge_history): New test.
> (test_list): Run it.
The new test XFails for me over ra_local but XPasses over
svnserveautocheck and davautocheck.
As we have no buildbots[1], could someone confirm?
Cheers,
Daniel
[1] See the "Buildbot migration" thread and INFRA-22761; current bottom
line: waiting for Infra or someone with an apache.org account to
edit and enable the buildbot configuration.
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Julian Foad <ju...@foad.me.uk>.
Julian Foad wrote:
> I DO confirm
>
> XPASS: log_tests.py 47: log --use-merge-history --xml
>
> with RA-svn/serf on trunk.
(That's today's trunk with your 'str/unicode/...' check line removed.)
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Julian Foad <ju...@foad.me.uk>.
Julian Foad wrote:
> I DO confirm
>
> XPASS: log_tests.py 47: log --use-merge-history --xml
>
> with RA-svn/serf on trunk.
(That's today's trunk with your 'str/unicode/...' check line removed.)
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 25 jan. 2022 kl 15:40 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> Daniel Sahlberg wrote on Tue, 25 Jan 2022 13:29 +00:00:
> > Oh. That is interesting, I never thought about running the checks on svn
> > and dav. Is there a way to flag the test as "only xfails on local", and
> can
> > someone help me do this? I'm a bit short on time right now.
>
> r1897457.
>
Thanks!
/Daniel
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 25 jan. 2022 kl 15:40 skrev Daniel Shahaf <d....@daniel.shahaf.name>:
> Daniel Sahlberg wrote on Tue, 25 Jan 2022 13:29 +00:00:
> > Oh. That is interesting, I never thought about running the checks on svn
> > and dav. Is there a way to flag the test as "only xfails on local", and
> can
> > someone help me do this? I'm a bit short on time right now.
>
> r1897457.
>
Thanks!
/Daniel
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Sahlberg wrote on Tue, 25 Jan 2022 13:29 +00:00:
> Oh. That is interesting, I never thought about running the checks on svn
> and dav. Is there a way to flag the test as "only xfails on local", and can
> someone help me do this? I'm a bit short on time right now.
r1897457.
Cheers,
Daniel
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Sahlberg wrote on Tue, 25 Jan 2022 13:29 +00:00:
> Oh. That is interesting, I never thought about running the checks on svn
> and dav. Is there a way to flag the test as "only xfails on local", and can
> someone help me do this? I'm a bit short on time right now.
r1897457.
Cheers,
Daniel
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 25 jan. 2022 kl 14:21 skrev Julian Foad <ju...@foad.me.uk>:
>
>
> On Jan 25 2022, at 1:15 pm, Julian Foad <ju...@foad.me.uk> wrote:
>
> > Daniel Shahaf wrote:
> >> dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
> >>> Add a test for issue #4856, "invalid xml file produced by: svn log
> --xml
> >>> --use-merge-history".
> >>
> >> The new test XFails for me over ra_local but XPasses over
> >> svnserveautocheck and davautocheck.
> >
> > On the 'pristines-on-demand' branch I get XFAIL over all three
>
> Oops, no, that was the wrong test ('log --use-merge-history --search
> [#4711]').
>
> I DO confirm
>
> XPASS: log_tests.py 47: log --use-merge-history --xml
> with RA-svn/serf on trunk.
>
Oh. That is interesting, I never thought about running the checks on svn
and dav. Is there a way to flag the test as "only xfails on local", and can
someone help me do this? I'm a bit short on time right now.
Thanks,
Daniel Sahlberg
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Sahlberg <da...@gmail.com>.
Den tis 25 jan. 2022 kl 14:21 skrev Julian Foad <ju...@foad.me.uk>:
>
>
> On Jan 25 2022, at 1:15 pm, Julian Foad <ju...@foad.me.uk> wrote:
>
> > Daniel Shahaf wrote:
> >> dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
> >>> Add a test for issue #4856, "invalid xml file produced by: svn log
> --xml
> >>> --use-merge-history".
> >>
> >> The new test XFails for me over ra_local but XPasses over
> >> svnserveautocheck and davautocheck.
> >
> > On the 'pristines-on-demand' branch I get XFAIL over all three
>
> Oops, no, that was the wrong test ('log --use-merge-history --search
> [#4711]').
>
> I DO confirm
>
> XPASS: log_tests.py 47: log --use-merge-history --xml
> with RA-svn/serf on trunk.
>
Oh. That is interesting, I never thought about running the checks on svn
and dav. Is there a way to flag the test as "only xfails on local", and can
someone help me do this? I'm a bit short on time right now.
Thanks,
Daniel Sahlberg
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Julian Foad <ju...@foad.me.uk>.
On Jan 25 2022, at 1:15 pm, Julian Foad <ju...@foad.me.uk> wrote:
> Daniel Shahaf wrote:
>> dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
>>> Add a test for issue #4856, "invalid xml file produced by: svn log --xml
>>> --use-merge-history".
>>
>> The new test XFails for me over ra_local but XPasses over
>> svnserveautocheck and davautocheck.
>
> On the 'pristines-on-demand' branch I get XFAIL over all three
Oops, no, that was the wrong test ('log --use-merge-history --search [#4711]').
I DO confirm
XPASS: log_tests.py 47: log --use-merge-history --xml
with RA-svn/serf on trunk.
- Julian
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Julian Foad <ju...@foad.me.uk>.
On Jan 25 2022, at 1:15 pm, Julian Foad <ju...@foad.me.uk> wrote:
> Daniel Shahaf wrote:
>> dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
>>> Add a test for issue #4856, "invalid xml file produced by: svn log --xml
>>> --use-merge-history".
>>
>> The new test XFails for me over ra_local but XPasses over
>> svnserveautocheck and davautocheck.
>
> On the 'pristines-on-demand' branch I get XFAIL over all three
Oops, no, that was the wrong test ('log --use-merge-history --search [#4711]').
I DO confirm
XPASS: log_tests.py 47: log --use-merge-history --xml
with RA-svn/serf on trunk.
- Julian
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Julian Foad wrote on Tue, 25 Jan 2022 13:15 +00:00:
> On a trunk WC (updated today) I get:
>
> File "/home/julianfoad/src/subversion-d/subversion/tests/cmdline/svntest/main.py", line 619, in <genexpr>
> assert all(isinstance(arg, (str, unicode, int)) for arg in varargs)
> NameError: name 'unicode' is not defined
>
> This is on Ubuntu 21.10 with Python 3.9. Is the 'unicode' class name too
> old or too new for this Python?
Yes:
$ python2 -c 'print(type(""), type(b""), type(u""))'
(<type 'str'>, <type 'str'>, <type 'unicode'>)
$ python3 -c 'print(type(""), type(b""), type(u""))'
<class 'str'> <class 'bytes'> <class 'str'>
So, I think changing the check to «isinstance(arg, (type(b""),
type(u""), int))» would work on both py2 and py3. We can't just remove
«unicode» from there because that'd break svnrdump_tests under py2.
Incidentally, Python 2 has separate «int» and «long» types (e.g, 2**63
evaluates to a «long») whereas Python 3 has only «int», but that's easy
to handle one way or another.
Thanks for the confirmation elsethread.
Cheers,
Daniel
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Julian Foad wrote on Tue, 25 Jan 2022 13:15 +00:00:
> On a trunk WC (updated today) I get:
>
> File "/home/julianfoad/src/subversion-d/subversion/tests/cmdline/svntest/main.py", line 619, in <genexpr>
> assert all(isinstance(arg, (str, unicode, int)) for arg in varargs)
> NameError: name 'unicode' is not defined
>
> This is on Ubuntu 21.10 with Python 3.9. Is the 'unicode' class name too
> old or too new for this Python?
Yes:
$ python2 -c 'print(type(""), type(b""), type(u""))'
(<type 'str'>, <type 'str'>, <type 'unicode'>)
$ python3 -c 'print(type(""), type(b""), type(u""))'
<class 'str'> <class 'bytes'> <class 'str'>
So, I think changing the check to «isinstance(arg, (type(b""),
type(u""), int))» would work on both py2 and py3. We can't just remove
«unicode» from there because that'd break svnrdump_tests under py2.
Incidentally, Python 2 has separate «int» and «long» types (e.g, 2**63
evaluates to a «long») whereas Python 3 has only «int», but that's easy
to handle one way or another.
Thanks for the confirmation elsethread.
Cheers,
Daniel
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Julian Foad <ju...@foad.me.uk>.
Daniel Shahaf wrote:
> dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
>> Add a test for issue #4856, "invalid xml file produced by: svn log --xml
>> --use-merge-history".
>
> The new test XFails for me over ra_local but XPasses over
> svnserveautocheck and davautocheck.
On the 'pristines-on-demand' branch I get XFAIL over all three, with
this being the failure message in each case:
EXCEPTION: Failure: Apparently invalid XML in '<?xml version="1.0" encoding="UTF-8"?>\n\n<log>\n\n</logentry>\n\n</log>\n'
On a trunk WC (updated today) I get:
File
"/home/julianfoad/src/subversion-d/subversion/tests/cmdline/svntest/main.py",
line 619, in <genexpr>
assert all(isinstance(arg, (str, unicode, int)) for arg in varargs)
NameError: name 'unicode' is not defined
This is on Ubuntu 21.10 with Python 3.9. Is the 'unicode' class name too
old or too new for this Python?
Oh... I see you added that line just today! r1897452.
- Julian
Re: svn commit: r1897133 - /subversion/trunk/subversion/tests/cmdline/log_tests.py
Posted by Julian Foad <ju...@foad.me.uk>.
Daniel Shahaf wrote:
> dsahlberg@apache.org wrote on Sun, 16 Jan 2022 19:19 +00:00:
>> Add a test for issue #4856, "invalid xml file produced by: svn log --xml
>> --use-merge-history".
>
> The new test XFails for me over ra_local but XPasses over
> svnserveautocheck and davautocheck.
On the 'pristines-on-demand' branch I get XFAIL over all three, with
this being the failure message in each case:
EXCEPTION: Failure: Apparently invalid XML in '<?xml version="1.0" encoding="UTF-8"?>\n\n<log>\n\n</logentry>\n\n</log>\n'
On a trunk WC (updated today) I get:
File
"/home/julianfoad/src/subversion-d/subversion/tests/cmdline/svntest/main.py",
line 619, in <genexpr>
assert all(isinstance(arg, (str, unicode, int)) for arg in varargs)
NameError: name 'unicode' is not defined
This is on Ubuntu 21.10 with Python 3.9. Is the 'unicode' class name too
old or too new for this Python?
Oh... I see you added that line just today! r1897452.
- Julian