/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/per_branch/test_stacking.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 17:17:18 UTC
  • mto: This revision was merged to the branch mainline in revision 6743.
  • Revision ID: jelmer@jelmer.uk-20170723171718-e6digv00ohocq7uq
Move UnstackableBranchFormat.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_stacking.py
28
28
 
29
29
 
30
30
unstackable_format_errors = (
31
 
    errors.UnstackableBranchFormat,
 
31
    branch.UnstackableBranchFormat,
32
32
    errors.UnstackableRepositoryFormat,
33
33
    )
34
34
 
309
309
        cloned_unstacked_bzrdir = stacked_bzrdir.clone('cloned-unstacked',
310
310
            preserve_stacking=False)
311
311
        unstacked_branch = cloned_unstacked_bzrdir.open_branch()
312
 
        self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
 
312
        self.assertRaises((errors.NotStacked, branch.UnstackableBranchFormat),
313
313
                          unstacked_branch.get_stacked_on_url)
314
314
 
315
315
    def test_no_op_preserve_stacking(self):
316
316
        """With no stacking, preserve_stacking should be a no-op."""
317
317
        branch = self.make_branch('source')
318
318
        cloned_bzrdir = branch.controldir.clone('cloned', preserve_stacking=True)
319
 
        self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
 
319
        self.assertRaises((errors.NotStacked, branch.UnstackableBranchFormat),
320
320
                          cloned_bzrdir.open_branch().get_stacked_on_url)
321
321
 
322
322
    def make_stacked_on_matching(self, source):
344
344
            self.assertEqual('../stack-on', target.get_stacked_on_url())
345
345
        else:
346
346
            self.assertRaises(
347
 
                errors.UnstackableBranchFormat, target.get_stacked_on_url)
 
347
                branch.UnstackableBranchFormat, target.get_stacked_on_url)
348
348
 
349
349
    def test_clone_stacking_policy_handling(self):
350
350
        """Obey policy where possible, ignore otherwise."""
361
361
            self.assertEqual('../stack-on', target.get_stacked_on_url())
362
362
        else:
363
363
            self.assertRaises(
364
 
                errors.UnstackableBranchFormat, target.get_stacked_on_url)
 
364
                branch.UnstackableBranchFormat, target.get_stacked_on_url)
365
365
 
366
366
    def test_sprout_to_smart_server_stacking_policy_handling(self):
367
367
        """Obey policy where possible, ignore otherwise."""
379
379
            self.assertEqual('../stack-on', target.get_stacked_on_url())
380
380
        else:
381
381
            self.assertRaises(
382
 
                errors.UnstackableBranchFormat, target.get_stacked_on_url)
 
382
                branch.UnstackableBranchFormat, target.get_stacked_on_url)
383
383
 
384
384
    def prepare_stacked_on_fetch(self):
385
385
        stack_on = self.make_branch_and_tree('stack-on')