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

Re: [PATCH] Test for line ending bug in svnrdump (issue 4263)

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Wed, 12 Dec 2012 01:01:05 +0200

Gabriela Gibson wrote on Tue, Dec 11, 2012 at 22:18:54 +0000:
> On 11/12/12 00:46, Daniel Shahaf wrote:
>
>> Need parentheses around the symbol name. Lines should be wrapped at 80
>> characters and subsequent lines indented.
>
> The web page instructions[1] need updating because they doesn't mention
> this and so, I was trying to stay under a 72 character limit for the
> mailing list.
>

It seems
http://subversion.apache.org/docs/community-guide/conventions#log-messages
doesn't mention that either. Though I believe we recommend 79 columns
for code.

Anyway, the original issue I saw was that the log message had a ~full
line and the next line was aligned to column zero. The log message on
this iteration is fine.

>> Re your other mail about OPW, you shouldn't let yourself be blocked by
>> this --- while this patch is outstanding, you should feel free to work
>> on another patch. The natural choice would be the C patch that turns
>> this test from XFAIL to PASS.
>
> I will attempt to do just this. Also your tip with the libtool was much
> appreciated, thank you very much :)
>

Welcome.

> Index: subversion/tests/cmdline/svnrdump_tests.py
> ===================================================================
> --- subversion/tests/cmdline/svnrdump_tests.py (revision 1420388)
> +++ subversion/tests/cmdline/svnrdump_tests.py (working copy)
> @@ -356,6 +356,12 @@ def copy_bad_line_endings_dump(sbox):
> expected_dumpfile_name="copy-bad-line-endings.expected.dump",
> bypass_prop_validation=True)
>
> +@XFail()
> +@Issue(4263)
> +def copy_bad_line_endings_load(sbox):
> + "load: inconsistent line endings in svn:* props"
> + run_load_test(sbox, "copy-bad-line-endings.dump")
> +

OK, sorry, I missed it yesterday, but there's a problem here. Looking
at the docstring of run_load_test():

    def run_load_test(sbox, dumpfile_name, expected_dumpfile_name = None,
                      expect_deltas = True):
      """Load a dumpfile using 'svnrdump load', dump it with 'svnadmin
      dump' and check that the same dumpfile is produced"""

It checks for identity. However, the problem here is \r in an svn:*
property; as of 1.6, the server doesn't allow any new instances of this
to enter a repository, so the resulting dumpfile won't be equal to the
input one.

I think you need to pass expected_dumpfile_name= to run_load_test().

Does that make sense?

>

Cheers

Daniel
Received on 2012-12-12 00:01:57 CET

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