[MERGE] Improvements to test_bzrdir

Robert Collins robertc at robertcollins.net
Fri Aug 18 07:59:41 BST 2006


On Fri, 2006-08-18 at 15:26 +1000, Andrew Bennetts wrote:
> -        target = dir.sprout(self.get_url('target'))
> +        try:
> +            target = dir.sprout(self.get_url('target'))
> +        except errors.NotLocalUrl:
> +            raise TestSkipped('Cannot sprout to remote bzrdirs.')
>          self.assertNotEqual(dir.transport.base,
> target.transport.base)
>          self.assertDirectoriesEqual(dir.root_transport,
> target.root_transport,
>                                      ['./.bzr/stat-cache',
> @@ -602,7 +665,10 @@
>              shared_repo = self.make_repository('target', shared=True)
>          except errors.IncompatibleFormat:
>              return
> -        target = dir.sprout(self.get_url('target/child'))
> +        try:
> +            target = dir.sprout(self.get_url('target/child'))
> +        except errors.NotLocalUrl:
> +            raise TestSkipped('Cannot sprout to remote bzrdirs.') 


This is still somewhat redundant...

would be nice to have this block factored out too (it appears a number
of times).

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060818/8fccf740/attachment.pgp 


More information about the bazaar mailing list