You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Julian Foad <ju...@wandisco.com> on 2010/04/01 10:43:06 UTC
Re: 1.6.10 up for testing/signing - merge tests failing
On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
> 1.6.10 tarballs are up, the magic revision is r929659:
>
> http://orac.ece.utexas.edu/pub/svn/1.6.10/
For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs. Here's
the command and the end of the 'tests.log' output for test 45:
$ make davautocheck CLEANUP=1 FS_TYPE=fsfs HTTP_LIBRARY=serf
[[[
CMD: svn up svn-test-work/working_copies/merge_tests-45.E_only
--config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.077241>
At revision 7.
CMD: svn merge -r5:4
http://localhost:28541/svn-test-work/repositories/merge_tests-45/A/B/E
svn-test-work/working_copies/merge_tests-45.E_only --dry-run
--config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.255633>
CMD: svn merge -r5:4
http://localhost:28541/svn-test-work/repositories/merge_tests-45/A/B/E
svn-test-work/working_copies/merge_tests-45.E_only
--config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.266729>
=============================================================
Expected '__SVN_ROOT_NODE' and actual '__SVN_ROOT_NODE' in output tree
are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: __SVN_ROOT_NODE
Path: __SVN_ROOT_NODE
Contents: N/A (node is a directory)
Properties: {}
Attributes: {}
Children: 1
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: __SVN_ROOT_NODE
Path: __SVN_ROOT_NODE
Contents: None
Properties: {}
Attributes: {}
Children: None (node is probably a file)
Unequal Types: one Node is a file, the other is a directory
ACTUAL OUTPUT TREE:
svntest.wc.State('svn-test-work/working_copies/merge_tests-45.E_only/',
{
})
EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/main.py", line 1225, in run
rc = self.pred.run(**kw)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/testcase.py", line 204, in run
return self.test_case.run(sandbox=sandbox)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/merge_tests.py", line 4957, in mergeinfo_inheritance
None, 1)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 820, in run_and_verify_merge
b_baton, check_props, dry_run)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 955, in run_and_verify_merge2
check_props)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 615, in verify_update
tree.compare_trees ("output", actual_output, output_tree)
File
"/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/tree.py", line 620, in compare_trees
raise SVNTreeUnequal
SVNTreeUnequal
FAIL: merge_tests.py 45: target inherits mergeinfo from nearest
ancestor
]]]
System: Ubuntu 9.10.
Investigating.
- Julian
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by "C. Michael Pilato" <cm...@collab.net>.
C. Michael Pilato wrote:
> OVER NEON:
>
> PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
> PASS: merge_tests.py 77: subtrees added after start of merge range are ok
> PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
> PASS: merge_tests.py 124: no self referential filtering on added path
> PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
>
> OVER SERF:
>
> FAIL: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
> PASS: merge_tests.py 77: subtrees added after start of merge range are ok
> FAIL: merge_tests.py 79: merge --reintegrate with renamed file on branch
> FAIL: merge_tests.py 124: no self referential filtering on added path
> FAIL: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
>
> Man, as many times as I ran the test suite for those stupid issue #3242
> backports this is really, really surprising. But I can verify that if I run
> the tests right now on the backport branch, they fail in the same way. I'll
> dive in after lunch and see if I can figure out why we (once again) have
> disparity in our supposedly interchangeable WebDAV RA providers.
Once I got into this debugging, I *knew* I'd been here before. The
issue-3242 partial backport stuffs exposed a long-hidden subtle bug in
ra_serf -- a bug I'd already fixed in trunk, but neglected to backport to 1.6.x:
------------------------------------------------------------------------
r880461 | cmpilato | 2009-11-05 13:48:29 -0500 (Thu, 05 Nov 2009) | 9 lines
Changed paths:
M /subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c
Fix an obscure buglet in libsvn_ra_serf masked by our typical usage of
svn_ra_get_mergeinfo().
* subversion/libsvn_ra_serf/mergeinfo.c
(end_element): Don't require that the mergeinfo REPORT response's
path have any length to it. As those paths are relative to the
URL at which the REPORT was aimed, it's quite alright for them to
be the empty string.
------------------------------------------------------------------------
I've since proposed this fix for backport to 1.6.x. Sorry for (somehow)
missing this in my backport testing.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by "C. Michael Pilato" <cm...@collab.net>.
Paul Burba wrote:
> On Thu, Apr 1, 2010 at 8:52 AM, Paul Burba <pt...@gmail.com> wrote:
>> On Thu, Apr 1, 2010 at 8:08 AM, Paul Burba <pt...@gmail.com> wrote:
>>> On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
>>>> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>>>>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>>>>>> 1.6.10 tarballs are up, the magic revision is r929659:
>>>>>>
>>>>>> http://orac.ece.utexas.edu/pub/svn/1.6.10/
>>>>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>>>> If I roll the 1.6.x branch back to r929629, it passes.
>>> Hi Julian,
>>>
>>> Doesn't really help you, but those all pass for me:
>>>
>>> C:\SVN\src-branch-1.6.x\Release\subversion\tests\cmdline>python
>>> C:\SVN\src-branch-1.6.x\subversion\tests\cmdline\merge_tests.py 45 77
>>> 79 124 126 --http-library serf --cleanup
>>> PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
>>> PASS: merge_tests.py 77: subtrees added after start of merge range are ok
>>> PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
>>> PASS: merge_tests.py 124: no self referential filtering on added path
>>> PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
>> My bad, I didn't pass --url! I was still half asleep when I did that.
>> The tests pass for me over ra_neon, but all except 77 fail over
>> ra_serf.
>
> All 5 corresponding tests (45, 76, 78, 123, 125 for those playing at
> home) pass on trunk [fsfs | ra_serf]
>
> Paul
I'm seeing what Paul's seeing:
OVER NEON:
PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
PASS: merge_tests.py 77: subtrees added after start of merge range are ok
PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
PASS: merge_tests.py 124: no self referential filtering on added path
PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
OVER SERF:
FAIL: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
PASS: merge_tests.py 77: subtrees added after start of merge range are ok
FAIL: merge_tests.py 79: merge --reintegrate with renamed file on branch
FAIL: merge_tests.py 124: no self referential filtering on added path
FAIL: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
Man, as many times as I ran the test suite for those stupid issue #3242
backports this is really, really surprising. But I can verify that if I run
the tests right now on the backport branch, they fail in the same way. I'll
dive in after lunch and see if I can figure out why we (once again) have
disparity in our supposedly interchangeable WebDAV RA providers.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 1, 2010 at 6:07 PM, Paul Burba <pt...@gmail.com> wrote:
> On Thu, Apr 1, 2010 at 9:50 AM, Philip Martin
> <ph...@wandisco.com> wrote:
>> Philip Martin <ph...@wandisco.com> writes:
>>
>>> Paul Burba <pt...@gmail.com> writes:
>>>
>>>>> My bad, I didn't pass --url! I was still half asleep when I did that.
>>>>> The tests pass for me over ra_neon, but all except 77 fail over
>>>>> ra_serf.
>>>>
>>>> All 5 corresponding tests (45, 76, 78, 123, 125 for those playing at
>>>> home) pass on trunk [fsfs | ra_serf]
>>>
>>> Agreed. I get the same 4 failures as you, and they pass on trunk.
>>
>> This is the revision that causes the failures:
>>
>> r923779 | hwright | 2010-03-16 14:48:28 +0000 (Tue, 16 Mar 2010) | 16 lines
>>
>> Reintegrate the 1.6.x-issue-3242-partial branch:
>>
>> * ^/subversion/branches/1.6.x-issue-3242-partial
>> Merge a portion of the issue 3242 work, specifically the bit that
>> makes mergeinfo queries in the client layer happen against the
>> current RA session URL instead of forcibly against the repository
>> root URL (which might not be readable by the user per authz
>> policy). While this is not a full solution to issue #3242, it
>> should get us back to Subversion 1.4-level behavior which has
>> pretty consistently been deemed acceptable (enough) by our user
>> base.
>> Justification:
>> Issue #3242 is a hot issue. Hot topic, hot tempers, etc.
>> Votes:
>> +1: cmpilato, ivan, rhuijben
>
> This is also the revision that is causing the failure with
> basic_tests.py 37 "use folders with names like 'c:hi'".
>
> With 1.6.x-issue-3242-partial in place, basic_tests.py 37 now calls
> svn_client__open_ra_session_internal(), in
> libsvn_client/delete.c:delete_urls(), on the specific URL to be
> deleted:
>
> "file:///C%3A/SVN/src-branch-1.6.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/basic_tests-37/c:hi"
>
> rather than the root of the reposisotry:
>
> "file:///C%3A/SVN/src-branch-1.6.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/basic_tests-37"
>
> Note the trailing part now in the URL: "/c:hi". This ultimately
> causes svn_io_check_path() in libsvn_repos/repos.c:check_repos_path()
> to fail because it can't handle the ':'
>
> libsvn_repos-1.dll!check_repos_path() Line 1265 C
> libsvn_repos-1.dll!svn_repos_find_root_path() Line 1366 C
> libsvn_ra-1.dll!svn_ra_local__split_URL() Line 131 C
> libsvn_ra-1.dll!svn_ra_local__open() Line 454 C
> libsvn_ra-1.dll!svn_ra_open3() Line 481 C
> libsvn_client-1.dll!svn_client__open_ra_session_internal() Line 296 C
> libsvn_client-1.dll!delete_urls() Line 187 C
> libsvn_client-1.dll!svn_client_delete3() Line 270 C
> svn.exe!svn_cl__delete() Line 83 C
> svn.exe!main() Line 2119 C
> svn.exe!__tmainCRTStartup() Line 582 C
> svn.exe!mainCRTStartup() Line 399 C
>
> There are a slew of fixes in this space on trunk that will probably
> need to be backported,
>
> http://svn.apache.org/viewvc?view=revision&revision=920292
>
> and
>
> http://svn.apache.org/viewvc?view=revision&revision=876414
>
> look to be the first two, but so far all they do is move the problem around :-)
>
> I'll dig some more tomorrow.
>
> Bert - CCed you specifically since you've done a lot of work with the
> svn_[dirent|uri]_* APIs as well as the "c:hi"-type fixes, so if you
> think I'm on a fool's errand here (i.e. going to require 1.7 APIs to
> fix) please let me know!
Appears it was simpler than I first thought: The only change needed to
fix basic_tests.py 37 over ra_local on Windows is
http://svn.apache.org/viewvc?view=revision&revision=877014
Running the [ra_local x fsfs] tests in full right now. Assuming there
are no unexpected problems I'll nominate r877014 for backport when
they are finished.
Paul
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 1, 2010 at 9:50 AM, Philip Martin
<ph...@wandisco.com> wrote:
> Philip Martin <ph...@wandisco.com> writes:
>
>> Paul Burba <pt...@gmail.com> writes:
>>
>>>> My bad, I didn't pass --url! I was still half asleep when I did that.
>>>> The tests pass for me over ra_neon, but all except 77 fail over
>>>> ra_serf.
>>>
>>> All 5 corresponding tests (45, 76, 78, 123, 125 for those playing at
>>> home) pass on trunk [fsfs | ra_serf]
>>
>> Agreed. I get the same 4 failures as you, and they pass on trunk.
>
> This is the revision that causes the failures:
>
> r923779 | hwright | 2010-03-16 14:48:28 +0000 (Tue, 16 Mar 2010) | 16 lines
>
> Reintegrate the 1.6.x-issue-3242-partial branch:
>
> * ^/subversion/branches/1.6.x-issue-3242-partial
> Merge a portion of the issue 3242 work, specifically the bit that
> makes mergeinfo queries in the client layer happen against the
> current RA session URL instead of forcibly against the repository
> root URL (which might not be readable by the user per authz
> policy). While this is not a full solution to issue #3242, it
> should get us back to Subversion 1.4-level behavior which has
> pretty consistently been deemed acceptable (enough) by our user
> base.
> Justification:
> Issue #3242 is a hot issue. Hot topic, hot tempers, etc.
> Votes:
> +1: cmpilato, ivan, rhuijben
This is also the revision that is causing the failure with
basic_tests.py 37 "use folders with names like 'c:hi'".
With 1.6.x-issue-3242-partial in place, basic_tests.py 37 now calls
svn_client__open_ra_session_internal(), in
libsvn_client/delete.c:delete_urls(), on the specific URL to be
deleted:
"file:///C%3A/SVN/src-branch-1.6.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/basic_tests-37/c:hi"
rather than the root of the reposisotry:
"file:///C%3A/SVN/src-branch-1.6.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/basic_tests-37"
Note the trailing part now in the URL: "/c:hi". This ultimately
causes svn_io_check_path() in libsvn_repos/repos.c:check_repos_path()
to fail because it can't handle the ':'
libsvn_repos-1.dll!check_repos_path() Line 1265 C
libsvn_repos-1.dll!svn_repos_find_root_path() Line 1366 C
libsvn_ra-1.dll!svn_ra_local__split_URL() Line 131 C
libsvn_ra-1.dll!svn_ra_local__open() Line 454 C
libsvn_ra-1.dll!svn_ra_open3() Line 481 C
libsvn_client-1.dll!svn_client__open_ra_session_internal() Line 296 C
libsvn_client-1.dll!delete_urls() Line 187 C
libsvn_client-1.dll!svn_client_delete3() Line 270 C
svn.exe!svn_cl__delete() Line 83 C
svn.exe!main() Line 2119 C
svn.exe!__tmainCRTStartup() Line 582 C
svn.exe!mainCRTStartup() Line 399 C
There are a slew of fixes in this space on trunk that will probably
need to be backported,
http://svn.apache.org/viewvc?view=revision&revision=920292
and
http://svn.apache.org/viewvc?view=revision&revision=876414
look to be the first two, but so far all they do is move the problem around :-)
I'll dig some more tomorrow.
Bert - CCed you specifically since you've done a lot of work with the
svn_[dirent|uri]_* APIs as well as the "c:hi"-type fixes, so if you
think I'm on a fool's errand here (i.e. going to require 1.7 APIs to
fix) please let me know!
Paul
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Philip Martin <ph...@wandisco.com>.
Philip Martin <ph...@wandisco.com> writes:
> Paul Burba <pt...@gmail.com> writes:
>
>>> My bad, I didn't pass --url! I was still half asleep when I did that.
>>> The tests pass for me over ra_neon, but all except 77 fail over
>>> ra_serf.
>>
>> All 5 corresponding tests (45, 76, 78, 123, 125 for those playing at
>> home) pass on trunk [fsfs | ra_serf]
>
> Agreed. I get the same 4 failures as you, and they pass on trunk.
This is the revision that causes the failures:
r923779 | hwright | 2010-03-16 14:48:28 +0000 (Tue, 16 Mar 2010) | 16 lines
Reintegrate the 1.6.x-issue-3242-partial branch:
* ^/subversion/branches/1.6.x-issue-3242-partial
Merge a portion of the issue 3242 work, specifically the bit that
makes mergeinfo queries in the client layer happen against the
current RA session URL instead of forcibly against the repository
root URL (which might not be readable by the user per authz
policy). While this is not a full solution to issue #3242, it
should get us back to Subversion 1.4-level behavior which has
pretty consistently been deemed acceptable (enough) by our user
base.
Justification:
Issue #3242 is a hot issue. Hot topic, hot tempers, etc.
Votes:
+1: cmpilato, ivan, rhuijben
--
Philip
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Philip Martin <ph...@wandisco.com>.
Paul Burba <pt...@gmail.com> writes:
>> My bad, I didn't pass --url! I was still half asleep when I did that.
>> The tests pass for me over ra_neon, but all except 77 fail over
>> ra_serf.
>
> All 5 corresponding tests (45, 76, 78, 123, 125 for those playing at
> home) pass on trunk [fsfs | ra_serf]
Agreed. I get the same 4 failures as you, and they pass on trunk.
--
Philip
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 1, 2010 at 8:52 AM, Paul Burba <pt...@gmail.com> wrote:
> On Thu, Apr 1, 2010 at 8:08 AM, Paul Burba <pt...@gmail.com> wrote:
>> On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
>>> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>>>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>>>> > 1.6.10 tarballs are up, the magic revision is r929659:
>>>> >
>>>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>>>>
>>>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>>>
>>> If I roll the 1.6.x branch back to r929629, it passes.
>>
>> Hi Julian,
>>
>> Doesn't really help you, but those all pass for me:
>>
>> C:\SVN\src-branch-1.6.x\Release\subversion\tests\cmdline>python
>> C:\SVN\src-branch-1.6.x\subversion\tests\cmdline\merge_tests.py 45 77
>> 79 124 126 --http-library serf --cleanup
>> PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
>> PASS: merge_tests.py 77: subtrees added after start of merge range are ok
>> PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
>> PASS: merge_tests.py 124: no self referential filtering on added path
>> PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
>
> My bad, I didn't pass --url! I was still half asleep when I did that.
> The tests pass for me over ra_neon, but all except 77 fail over
> ra_serf.
All 5 corresponding tests (45, 76, 78, 123, 125 for those playing at
home) pass on trunk [fsfs | ra_serf]
Paul
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Greg Stein <gs...@gmail.com>.
On Thu, Apr 1, 2010 at 09:23, Julian Foad <ju...@wandisco.com> wrote:
> On Thu, 2010-04-01 at 08:52 -0400, Paul Burba wrote:
>> On Thu, Apr 1, 2010 at 8:08 AM, Paul Burba <pt...@gmail.com> wrote:
>> > On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
>> >> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>> >>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>> >>> > 1.6.10 tarballs are up, the magic revision is r929659:
>> >>> >
>> >>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>> >>>
>> >>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>> >>
>> >> If I roll the 1.6.x branch back to r929629, it passes.
>
> D'oh, but trying again with r929629, running them individually, they all
> fail except 77 which pass:
>
> [[[
> $ svn-py-test merge 45 77 79 124 126 --http-library=serf
> --url=http://localhost:12843 --no-cleanup
> [...]
> FAIL: merge_tests.py 45: target inherits mergeinfo from nearest
> ancestor
> PASS: merge_tests.py 77: subtrees added after start of merge range are
> ok
> [...]
> ]]]
>
> Don't know what's up with my testing to cause this discrepancy between
> the full 'make davautocheck' and individual tests, and haven't yet
> repeated them.
Make sure that your test environment has plenty of file handles
available. I've seen spurious errors if the ulimit hasn't been
increased before a test run.
Cheers,
-g
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 1, 2010 at 9:23 AM, Julian Foad <ju...@wandisco.com> wrote:
> On Thu, 2010-04-01 at 08:52 -0400, Paul Burba wrote:
>> On Thu, Apr 1, 2010 at 8:08 AM, Paul Burba <pt...@gmail.com> wrote:
>> > On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
>> >> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>> >>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>> >>> > 1.6.10 tarballs are up, the magic revision is r929659:
>> >>> >
>> >>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>> >>>
>> >>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>> >>
>> >> If I roll the 1.6.x branch back to r929629, it passes.
>
> D'oh, but trying again with r929629, running them individually, they all
> fail except 77 which pass:
>
> [[[
> $ svn-py-test merge 45 77 79 124 126 --http-library=serf
> --url=http://localhost:12843 --no-cleanup
> [...]
> FAIL: merge_tests.py 45: target inherits mergeinfo from nearest
> ancestor
> PASS: merge_tests.py 77: subtrees added after start of merge range are
> ok
> [...]
> ]]]
>
> Don't know what's up with my testing to cause this discrepancy between
> the full 'make davautocheck' and individual tests, and haven't yet
> repeated them.
>
>> The tests pass for me over ra_neon, but all except 77 fail over
>> ra_serf.
>
>> > The likely culprit would seem r929603...can you confirm that is
>> > where the failure starts?
>
> You mean r929630 I believe.
Yes, that is the revision I meant.
Paul
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Julian Foad <ju...@wandisco.com>.
On Thu, 2010-04-01 at 08:52 -0400, Paul Burba wrote:
> On Thu, Apr 1, 2010 at 8:08 AM, Paul Burba <pt...@gmail.com> wrote:
> > On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
> >> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
> >>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
> >>> > 1.6.10 tarballs are up, the magic revision is r929659:
> >>> >
> >>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
> >>>
> >>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
> >>
> >> If I roll the 1.6.x branch back to r929629, it passes.
D'oh, but trying again with r929629, running them individually, they all
fail except 77 which pass:
[[[
$ svn-py-test merge 45 77 79 124 126 --http-library=serf
--url=http://localhost:12843 --no-cleanup
[...]
FAIL: merge_tests.py 45: target inherits mergeinfo from nearest
ancestor
PASS: merge_tests.py 77: subtrees added after start of merge range are
ok
[...]
]]]
Don't know what's up with my testing to cause this discrepancy between
the full 'make davautocheck' and individual tests, and haven't yet
repeated them.
> The tests pass for me over ra_neon, but all except 77 fail over
> ra_serf.
> > The likely culprit would seem r929603...can you confirm that is
> > where the failure starts?
You mean r929630 I believe. Not confirmed yet.
> > Do you see the same failures on trunk?
No I don't see those failures on trunk, and I don't see them in 1.6.9.
- Julian
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 1, 2010 at 8:08 AM, Paul Burba <pt...@gmail.com> wrote:
> On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
>> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>>> > 1.6.10 tarballs are up, the magic revision is r929659:
>>> >
>>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>>>
>>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>>
>> If I roll the 1.6.x branch back to r929629, it passes.
>
> Hi Julian,
>
> Doesn't really help you, but those all pass for me:
>
> C:\SVN\src-branch-1.6.x\Release\subversion\tests\cmdline>python
> C:\SVN\src-branch-1.6.x\subversion\tests\cmdline\merge_tests.py 45 77
> 79 124 126 --http-library serf --cleanup
> PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
> PASS: merge_tests.py 77: subtrees added after start of merge range are ok
> PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
> PASS: merge_tests.py 124: no self referential filtering on added path
> PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
My bad, I didn't pass --url! I was still half asleep when I did that.
The tests pass for me over ra_neon, but all except 77 fail over
ra_serf.
Paul
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <ju...@wandisco.com> wrote:
> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>> > 1.6.10 tarballs are up, the magic revision is r929659:
>> >
>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>>
>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>
> If I roll the 1.6.x branch back to r929629, it passes.
Hi Julian,
Doesn't really help you, but those all pass for me:
C:\SVN\src-branch-1.6.x\Release\subversion\tests\cmdline>python
C:\SVN\src-branch-1.6.x\subversion\tests\cmdline\merge_tests.py 45 77
79 124 126 --http-library serf --cleanup
PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
PASS: merge_tests.py 77: subtrees added after start of merge range are ok
PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
PASS: merge_tests.py 124: no self referential filtering on added path
PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
The likely culprit would seem r929603...can you confirm that is where
the failure starts?
Do you see the same failures on trunk?
Anyone else seeing this?
Paul
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Julian Foad <ju...@wandisco.com>.
On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
> > 1.6.10 tarballs are up, the magic revision is r929659:
> >
> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>
> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
If I roll the 1.6.x branch back to r929629, it passes.
- Julian
> Here's
> the command and the end of the 'tests.log' output for test 45:
>
> $ make davautocheck CLEANUP=1 FS_TYPE=fsfs HTTP_LIBRARY=serf
>
> [[[
> CMD: svn up svn-test-work/working_copies/merge_tests-45.E_only
> --config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.077241>
> At revision 7.
> CMD: svn merge -r5:4
> http://localhost:28541/svn-test-work/repositories/merge_tests-45/A/B/E
> svn-test-work/working_copies/merge_tests-45.E_only --dry-run
> --config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.255633>
> CMD: svn merge -r5:4
> http://localhost:28541/svn-test-work/repositories/merge_tests-45/A/B/E
> svn-test-work/working_copies/merge_tests-45.E_only
> --config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.266729>
> =============================================================
> Expected '__SVN_ROOT_NODE' and actual '__SVN_ROOT_NODE' in output tree
> are different!
> =============================================================
> EXPECTED NODE TO BE:
> =============================================================
> * Node name: __SVN_ROOT_NODE
> Path: __SVN_ROOT_NODE
> Contents: N/A (node is a directory)
> Properties: {}
> Attributes: {}
> Children: 1
> =============================================================
> ACTUAL NODE FOUND:
> =============================================================
> * Node name: __SVN_ROOT_NODE
> Path: __SVN_ROOT_NODE
> Contents: None
> Properties: {}
> Attributes: {}
> Children: None (node is probably a file)
> Unequal Types: one Node is a file, the other is a directory
> ACTUAL OUTPUT TREE:
> svntest.wc.State('svn-test-work/working_copies/merge_tests-45.E_only/',
> {
> })
> EXCEPTION: SVNTreeUnequal
> Traceback (most recent call last):
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/main.py", line 1225, in run
> rc = self.pred.run(**kw)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/testcase.py", line 204, in run
> return self.test_case.run(sandbox=sandbox)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
> return self.func(sandbox)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/merge_tests.py", line 4957, in mergeinfo_inheritance
> None, 1)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 820, in run_and_verify_merge
> b_baton, check_props, dry_run)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 955, in run_and_verify_merge2
> check_props)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 615, in verify_update
> tree.compare_trees ("output", actual_output, output_tree)
> File
> "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/tree.py", line 620, in compare_trees
> raise SVNTreeUnequal
> SVNTreeUnequal
> FAIL: merge_tests.py 45: target inherits mergeinfo from nearest
> ancestor
> ]]]
>
> System: Ubuntu 9.10.
>
> Investigating.
>
> - Julian
>
>
Re: 1.6.10 up for testing/signing - merge tests failing
Posted by Philip Martin <ph...@wandisco.com>.
Julian Foad <ju...@wandisco.com> writes:
> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>> 1.6.10 tarballs are up, the magic revision is r929659:
>>
>> http://orac.ece.utexas.edu/pub/svn/1.6.10/
>
> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs. Here's
> the command and the end of the 'tests.log' output for test 45:
>
> $ make davautocheck CLEANUP=1 FS_TYPE=fsfs HTTP_LIBRARY=serf
My tests on Debian stable are still running but I see failures for
merge_tests.py 45 79 124 126, however 77 is a pass.
--
Philip