On Mon, Nov 24, 2008 at 11:03 AM, Hyrum K. Wright
<hyrum_wright_at_mail.utexas.edu> wrote:
> Julian Foad wrote:
>> On Mon, 2008-11-24 at 09:23 -0600, Hyrum K. Wright wrote:
>>> From the latest run of the Windows buildbot:
>>>
>>> At least one test FAILED, checking M:\svn-auto-test\fsfs\tests.log
>>> FAIL: depth_tests.py 37: tree conflicts resolved depth-immediates
>>>
>>> FAIL: depth_tests.py 38: tree conflicts resolved depth-infinity
>>>
>>> 07:03 AM
>>>
>>> I think that these tests started failing after r34345, but that was obscured by
>>> that fact that there were a bunch of other tests failing on that buildbot at the
>>> same time. I've since fixed those failures, but could a tree-conflicts-minded
>>> person take a look at the two depth tests above?
>>
>> I've just had a look. It's to do with the new function "verify_lines".
>>
>>>From the test log:
>>
>>> CMD: svn.exe resolved "--depth=immediates" "svn-test-work\working_copies\depth_tests-37\A" --config-dir "M:\svn-auto-test\fsfs\subversion\tests\cmdline\svn-test-work\local_tmp\config" --password rayjandom --no-auth-cache --username jrandom <TIME = 0.453000>
>>>
>>> Resolved conflicted state of 'svn-test-work\working_copies\depth_tests-37\A\B'
>>>
>>> Resolved conflicted state of 'svn-test-work\working_copies\depth_tests-37\A\mu'
>>>
>>> UNEXPECTED OUTPUT: 0 occurrences of 'Resolved conflicted state of 'svn-test-work\working_copies\depth_tests-37\A\mu'
>>>
>>> '
>>>
>>> Actual output:
>>
>> Here there is an exception due to lack of "import sys", which I fixed in
>> r34381.
>>
>> The double-spacing is common to all of the test log output on this
>> build-bot.
>>
>> Otherwise the output looks just like the expected output. BUT: The
>> expected output is supposed to be a regular expression, so the backslash
>> characters are interpreted as escapes.
>>
>> Fixed, I hope (but have no Windows to test on), in 34383.
>
> Thanks for taking a look. We'll all collectively hold our breaths until the
> Windows buildbot gets around to testing r34383. (Unless, of course, a
> windows-minded person can confirm passage locally.)
Looks good, with trunk_at_34383:
C:\SVN\src-trunk\Release\subversion\tests\cmdline>depth_tests.py 37 38 --cleanup
PASS: depth_tests.py 37: tree conflicts resolved depth-immediates
PASS: depth_tests.py 38: tree conflicts resolved depth-infinity
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-24 17:41:16 CET