Daniel Shahaf wrote: > julianf...@apache.org wrote on Mon, 25 Jan 2010 at 17:29 -0000: > > Fix the expected output of an XFail test added in r902841, so that when the > > bug is fixed the test will have at least a chance of passing. > > > > + rav_svn(None, "Adding.*New|Adding.*first||Committed revision 4.", [], > > You don't want two consecutive "|"'s there, I think :-)
Hi Daniel. The two consecutive bars represent an empty line, which is the third of four lines of expected output, judging by Paul's email. It's possible that that was an unintended artifact in the email, but I tested the behaviour and confirmed that the specified pattern had to match a whole line, so it would not be a "match anything" pattern. > (Also, should this have leading/trailing ".*"?) No - the patterns there are meant to match the whole line, and I tested a very similar pattern against the output of an earlier commit in the same test to make sure it didn't need to include newlines or anything. Thanks for reviewing. - Julian > > + 'ci', '-m', > > 'Revert svn merge. svn mv %s %s.' % (first_path, second_path), > > a_dir)
