/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
560
560
        child_branch, new_child_transport = self.prepare_default_stacking(
561
561
            child_format='pack-0.92')
562
562
        new_child = child_branch.controldir.clone_on_transport(new_child_transport)
563
 
        self.assertRaises(errors.UnstackableBranchFormat,
 
563
        self.assertRaises(branch.UnstackableBranchFormat,
564
564
                          new_child.open_branch().get_stacked_on_url)
565
565
 
566
566
    def test_sprout_ignores_policy_for_unsupported_formats(self):
567
567
        child_branch, new_child_transport = self.prepare_default_stacking(
568
568
            child_format='pack-0.92')
569
569
        new_child = child_branch.controldir.sprout(new_child_transport.base)
570
 
        self.assertRaises(errors.UnstackableBranchFormat,
 
570
        self.assertRaises(branch.UnstackableBranchFormat,
571
571
                          new_child.open_branch().get_stacked_on_url)
572
572
 
573
573
    def test_sprout_upgrades_format_if_stacked_specified(self):
1556
1556
        # a feature can only be registered once
1557
1557
        self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
1558
1558
        SampleBzrFormat.register_feature("nested-trees")
1559
 
        self.assertRaises(errors.FeatureAlreadyRegistered,
 
1559
        self.assertRaises(bzrdir.FeatureAlreadyRegistered,
1560
1560
            SampleBzrFormat.register_feature, "nested-trees")
1561
1561
 
1562
1562
    def test_feature_with_space(self):