hi,<br><br><div><span class="gmail_quote">On 6/25/07, <b class="gmail_sendername">Robert Collins</b> &lt;<a href="mailto:robertc@robertcollins.net">robertc@robertcollins.net</a>&gt; wrote:<br>...<br></span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
assertRemoveErrorContainsRe can now away completely I think. I propose<br>the following -<br>delete the asertRemoveErrorContainsRe method<br>change<br>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;e = self.assertRaises(errors.BzrRemoveChangedFilesError, tree.remove
,<br>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TestRemove.files, keep_files=False)<br>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;self._assertRemoveErrorContainsRe(e, &#39;unknown:.*b/c.*b.*a.*d&#39;)<br><br>into<br><br>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;err = self.assertRaises(errors.BzrRemoveChangedFilesError
, tree.remove,<br>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TestRemove.files, keep_files=False)<br>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;self._assertContainsRe(err.changes_as_text, &#39;unknown:.*b/c.*b.*a.*d&#39;)<br></blockquote></div><br>is the following ok:<br>self._assertContainsRe(str(err), &#39;unknown:.*b/c.*b.*a.*d&#39;)
<br> (this works fine)<br><br>Because err.changes_as_text is unicode, and I can&#39;t convince it to work using this:<br>self.assertContainsRe(err.changes_as_text.encode(&#39;utf8&#39;),<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &#39;(?s)unknown:.*b/c.*b.*a.*d.*&#39;)
<br>This does not work, and I can&#39;t figure out why.<br><br>will look at it again tomorrow.<br><br>regards<br>marius<br><br><br><br>