[merge] cleanup remerge tests

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>>> So I went ahead and updated the remerge tests, moving them into their
>>> own file, and writing run_bzr_error to make it nicer to verify we are
>>> getting the error we expect.
> 
> +1.  It's nice to get run_bzr_error in there, though I think it should
> default to retcode=3, because that's our error retcode.
> 
> Aaron

So how about if I add:

kwargs.setdefault('retcode', 3)

I would be okay with that. I added a test case for 'run_bzr_error', see
the new bundle.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEpAWkJdeBCYSNAAMRAqnkAKCb8oi9+M/JJb5tnMgMQ6tUShnTggCdEG5Y
IerRyuB3jfRIH8peCCVfwT0=
=NKXT
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: update-remerge-tests.patch
Type: text/x-patch
Size: 24992 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060629/3bea4fbe/attachment.bin