[MERGE] test_sprout_uses_bzrdir_branch_format

[John Arbash Meinel]

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

So it ended up taking more to fix than I thought it would, so I'm
posting my updated version for review.

1) Almost none of the BranchFormat objects was setting the branch_format
attribute in its _matchingbzrdir. This adds a test for all of the
permutations being tested that they do.

Andrew and I had already done some of this, but I think he forgot to
include it when he split this patch of to be approved (the tests were
failing at least.)

2) It also turned out that the RemoteBranch tests were also not using a
matching bzrdir. They were using RemoteBzrDir() directly, but again,
self._matchingbzrdir.get_branch_format() would then return the default
format which is Branch6. Perhaps a better fix would be to hard-code
RemoteBzrDirFormat.get_branch_format() to return RemoteBranchFormat?

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

iEYEARECAAYFAkkjEPIACgkQJdeBCYSNAAOa2gCgk95Ut9FCXYyB2ASHcpaVIqLD
6g0AniPcR9OaSJEjULgcsWm+bJAiUhn6
=dEvY
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sprout-tests.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20081118/4fd06259/attachment.diff