On Mon, Mar 9, 2009 at 12:51, Bert Huijben <bert_at_qqmail.nl> wrote:
>...
>> Author: gstein
>> Date: Sun Mar 8 13:16:44 2009
>> New Revision: 36417
>>
>> Log:
>> Filter out lines that start with DBG: from output used to build trees or
>> used as stdout comparison. This allows code to generate debug output
>> without causing test failures.
>...
>> +++ trunk/subversion/tests/cmdline/svntest/verify.py Sun Mar 8 13:16:44
>> 2009 (r36417)
>> @@ -317,6 +317,10 @@ def compare_and_display_lines(message, l
>> if not isinstance(expected, ExpectedOutput):
>> expected = ExpectedOutput(expected)
>>
>> + if isinstance(actual, type('')):
>> + actual = actual.split('\n')
>> + actual = [line for line in actual if not line.startswith('DBG:')]
>> +
>> if expected != actual:
>> expected.display_differences(message, label, actual)
>> raise raisable
>
> This breaks svnadmin_tests.py 13: recover a repository (FSFS only).
>
> <snippet start-line="645">
> actual_current_contents = svntest.main.file_read(current_path)
> svntest.verify.compare_and_display_lines(
> "Contents of db/current is unexpected.",
> 'db/current', expected_current_contents, actual_current_contents)
> </snippet>
>
> I think the tests needs a fix (not your patch).
No... my patch was incorrect. I had the wrong semantics converting a
simple string to a list. It has been fixed in r36430.
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1296406
Received on 2009-03-09 15:24:45 CET