You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@wandisco.com> on 2010/02/01 19:28:11 UTC
mergeinfo regression test failures on trunk
I'm seeing lots of regression test failures. Alll the ones I've
looked at involve mergeinfo notifications:
../../../../src2/subversion/tests/cmdline/merge_tests.py 1
EXPECTED STDOUT (regexp):
--- Reverse-merging r3 into '.+':
|--- Recording mergeinfo for reverse merge of r3 .*:
|G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
| G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
ACTUAL STDOUT:
--- Reverse-merging r3 into 'svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho':
G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
--- Recording mergeinfo for merge of r4 through r8391162080374191731 into 'svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho':
G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
EXCEPTION: SVNUnmatchedError
I'm not sure if the problem is that lines are not it the expected
order or that the regexp doesn't match. Anybody else seeing this?
--
Philip
Re: mergeinfo regression test failures on trunk
Posted by Julian Foad <ju...@btopenworld.com>.
Philip Martin wrote:
> Julian Foad <ju...@btopenworld.com> writes:
>
> > On Mon, 2010-02-01, Philip Martin wrote:
> >> "C. Michael Pilato" <cm...@collab.net> writes:
> >>
> >> > Oh, I dunno. r8391162080374191731 seems a bit ... off. (But yes, the
> >> > regexps don't match -- they expect "Recording mergeinfo for reverse merge"
> >> > but get "Recording mergeinfo for merge" (no "reverse").
> >>
> >> I didn't spot that! 8391162080374191731 is 0x747365742D6E7673 which
> >> looks like an ASCII string. I guess we have a pool use problem.
> >
> > FWIW I can't reproduce the problem. The tests pass for me.
>
> I fixed the problem in r905403.
Oh. I should check before investigating. (I first tried it on the day
you reported it, but it still might have been after r905403.)
Thanks for fixing it.
- Julian
Re: mergeinfo regression test failures on trunk
Posted by Philip Martin <ph...@wandisco.com>.
Julian Foad <ju...@btopenworld.com> writes:
> On Mon, 2010-02-01, Philip Martin wrote:
>> "C. Michael Pilato" <cm...@collab.net> writes:
>>
>> > Oh, I dunno. r8391162080374191731 seems a bit ... off. (But yes, the
>> > regexps don't match -- they expect "Recording mergeinfo for reverse merge"
>> > but get "Recording mergeinfo for merge" (no "reverse").
>>
>> I didn't spot that! 8391162080374191731 is 0x747365742D6E7673 which
>> looks like an ASCII string. I guess we have a pool use problem.
>
> FWIW I can't reproduce the problem. The tests pass for me.
I fixed the problem in r905403.
--
Philip
Re: mergeinfo regression test failures on trunk
Posted by Julian Foad <ju...@btopenworld.com>.
On Mon, 2010-02-01, Philip Martin wrote:
> "C. Michael Pilato" <cm...@collab.net> writes:
>
> > Oh, I dunno. r8391162080374191731 seems a bit ... off. (But yes, the
> > regexps don't match -- they expect "Recording mergeinfo for reverse merge"
> > but get "Recording mergeinfo for merge" (no "reverse").
>
> I didn't spot that! 8391162080374191731 is 0x747365742D6E7673 which
> looks like an ASCII string. I guess we have a pool use problem.
FWIW I can't reproduce the problem. The tests pass for me.
I tried running the merge_tests.py with "svn" replaced by "valgrind ...
svn":
[[[
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py (revision 905541)
+++ subversion/tests/cmdline/svntest/main.py (working copy)
@@ -601,7 +601,8 @@
If ERROR_EXPECTED is None, any stderr also will be printed. If
you're just checking that something does/doesn't come out of
stdout/stderr, you might want to use actions.run_and_verify_svn()."""
- return run_command(svn_binary, error_expected, 0,
+ varargs = ('--log-file=/tmp/svn-valgrind/%p.log', '--error-exitcode=99', svn_binary) + varargs
+ return run_command('valgrind', error_expected, 0,
*(_with_auth(_with_config_dir(varargs))))
# For running svnadmin. Ignores the output.
]]]
No warnings showed up in the *.log files, only messages indicating there
were no problems, but I'm not sure if I set it up correctly.
- Julian
Re: mergeinfo regression test failures on trunk
Posted by Philip Martin <ph...@wandisco.com>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Oh, I dunno. r8391162080374191731 seems a bit ... off. (But yes, the
> regexps don't match -- they expect "Recording mergeinfo for reverse merge"
> but get "Recording mergeinfo for merge" (no "reverse").
I didn't spot that! 8391162080374191731 is 0x747365742D6E7673 which
looks like an ASCII string. I guess we have a pool use problem.
--
Philip
Re: mergeinfo regression test failures on trunk
Posted by "C. Michael Pilato" <cm...@collab.net>.
Philip Martin wrote:
> I'm seeing lots of regression test failures. Alll the ones I've
> looked at involve mergeinfo notifications:
>
> ../../../../src2/subversion/tests/cmdline/merge_tests.py 1
> EXPECTED STDOUT (regexp):
> --- Reverse-merging r3 into '.+':
> |--- Recording mergeinfo for reverse merge of r3 .*:
> |G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
> | G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
>
> ACTUAL STDOUT:
> --- Reverse-merging r3 into 'svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho':
> G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
> --- Recording mergeinfo for merge of r4 through r8391162080374191731 into 'svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho':
> G svn-test-work/working_copies/merge_tests-1.other/A/D/G/rho
> EXCEPTION: SVNUnmatchedError
>
>
> I'm not sure if the problem is that lines are not it the expected
> order or that the regexp doesn't match. Anybody else seeing this?
>
>
Oh, I dunno. r8391162080374191731 seems a bit ... off. (But yes, the
regexps don't match -- they expect "Recording mergeinfo for reverse merge"
but get "Recording mergeinfo for merge" (no "reverse").
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand