[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r36417 - trunk/subversion/tests/cmdline/svntest

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Mon, 9 Mar 2009 12:51:46 +0100

Hi Greg,

> -----Original Message-----
> From: Greg Stein [mailto:gstein_at_gmail.com]
> Sent: zondag 8 maart 2009 21:17
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r36417 - trunk/subversion/tests/cmdline/svntest
>
> 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.
>
> * subversion/tests/cmdline/svntest/verify.py:
> (compare_and_display_lines): filter DBG lines before comparing
>
> * subversion/tests/cmdline/svntest/tree.py:
> (...): whitespace fixes. remove some spurious parens in "if" statements.
> (build_tree_from_checkout, build_tree_from_commit,
> build_tree_from_status, build_tree_from_skipped,
> build_tree_from_diff_summarize): filter DBG lines
>
> Modified:
> trunk/subversion/tests/cmdline/svntest/tree.py
> trunk/subversion/tests/cmdline/svntest/verify.py
>

<snip />

> Modified: trunk/subversion/tests/cmdline/svntest/verify.py
> URL:
>
http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svntest/veri
fy
> .py?pathrev=36417&r1=36416&r2=36417
>
============================================================================
==
> --- trunk/subversion/tests/cmdline/svntest/verify.py Sun Mar 8 13:12:00
> 2009 (r36416)
> +++ 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).

        Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1295594
Received on 2009-03-09 12:52:06 CET

This is an archived mail posted to the Subversion Dev mailing list.