Re: merge_test.py-4 failing over DAV

Philip Martin <philip@codematters.co.uk> writes:

> the tests pass over ra_dav. Really we need to fix the test suite,
> I'll have a look but it's somewhere in that tree stuff and I'm not
> sure I understand it...

With this change to the test suite

Index: ../svn/subversion/tests/clients/cmdline/svntest/tree.py
===================================================================
--- ../svn/subversion/tests/clients/cmdline/svntest/tree.py (revision 3661)
+++ ../svn/subversion/tests/clients/cmdline/svntest/tree.py (working copy)
@@ -580,7 +580,7 @@
     repos_rev = '?'
     
   # Try http://www.wordsmith.org/anagram/anagram.cgi?anagram=ACDRMGU
- rm = re.compile ('^([MACDRUG_ ][MACDRUG_ ])(.)(.) . [^0-9-]+(\d+|-)(.{23})(.+)')
+ rm = re.compile ('^([MACDRUG_ ][MACDRUG_ ])(.)(.) . [^0-9-]+(\d+|-) +(\d+|-) +[^ ]+ +(.+)')
   for line in lines:
     match = rm.search(line)
     if match and match.groups():

I get what looks like the originally reported XML error

CMD: svn "merge" "-r2:1" "http://localhost:8888/repositories/merge_tests-4/A/B" "working_copies/merge_tests-4/A/B2"
../svn/subversion/libsvn_ra_dav/util.c:332: (apr_err=175002, src_err=0)
svn: RA layer request failed
svn: REPORT request failed on /repositories/merge_tests-4/A/B
../svn/subversion/libsvn_ra_dav/util.c:316: (apr_err=175002, src_err=0)
svn: The REPORT request returned invalid XML in the response: XML parse error at line 13: xmlParseStartTag: invalid element name
.. (/repositories/merge_tests-4/A/B)

which I think may require a change to merge_tests.py.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org