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

Re: [PATCH] Factorise 'svn lock' validation code

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-06-14 17:57:39 CEST

On Wed, 14 Jun 2006 14:53:39 +0530, Lieven Govaerts <lgo@mobsol.be> wrote:

> Quoting Garrett Rooney <rooneg@electricjellyfish.net>:
[snip]
>> Committed in r20086. Thanks,
>>
>> -garrett
>
> Garrett,
>
>
> this commit seems to make the test fail on the Win32/XP/VS2005
> buildslave. On
> Mac & Linux buildslaves it looks ok.

Could this be because the regex for comparing output includes \n and in
windows a newline is effectively \r\n?

I reviewed the code, and this is the only thing I could suspect. Sorry, I
dont have a windows box to test it right now...

Could somebody with a windows box, apply the attached patch, test and see?

Regards,
Madan.

Index: subversion/tests/cmdline/svntest/actions.py
===================================================================
--- subversion/tests/cmdline/svntest/actions.py (revision 20091)
+++ subversion/tests/cmdline/svntest/actions.py (working copy)
@@ -802,9 +802,9 @@
 
   # prepare the regexs to compare against
   token_re = re.compile (".*?Lock Token: opaquelocktoken:.*?", re.DOTALL)
- author_re = re.compile (".*?Lock Owner: %s\n.*?" % username, re.DOTALL)
+ author_re = re.compile (".*?Lock Owner: %s.*?" % username, re.DOTALL)
   created_re = re.compile (".*?Lock Created:.*?", re.DOTALL)
- comment_re = re.compile (".*?%s\n.*?" % comment, re.DOTALL)
+ comment_re = re.compile (".*?%s.*?" % comment, re.DOTALL)
   # join all output lines into one
   output = "".join(output)
   # Fail even if one regex does not match

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 14 12:31:44 2006

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