← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_stacking.py

  • Committer: Andrew Bennetts
  • Date: 2009-08-25 01:25:57 UTC
  • mfrom: (4642 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4657.
  • Revision ID: andrew.bennetts@canonical.com-20090825012557-1ku5o09nv3ra9n12
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_stacking.py
226
226
        return stacked_bzrdir
227
227
 
228
228
    def test_clone_from_stacked_branch_preserve_stacking(self):
229
 
        self.thisFailsStrictLockCheck()
230
229
        # We can clone from the bzrdir of a stacked branch. If
231
230
        # preserve_stacking is True, the cloned branch is stacked on the
232
231
        # same branch as the original.
243
242
            pass
244
243
 
245
244
    def test_clone_from_branch_stacked_on_relative_url_preserve_stacking(self):
246
 
        self.thisFailsStrictLockCheck()
247
245
        # If a branch's stacked-on url is relative, we can still clone
248
246
        # from it with preserve_stacking True and get a branch stacked
249
247
        # on an appropriately adjusted relative url.
258
256
            cloned_bzrdir.open_branch().get_stacked_on_url())
259
257
 
260
258
    def test_clone_from_stacked_branch_no_preserve_stacking(self):
261
 
        self.thisFailsStrictLockCheck()
262
259
        try:
263
260
            stacked_bzrdir = self.make_stacked_bzrdir()
264
261
        except unstackable_format_errors, e:
272
269
 
273
270
    def test_no_op_preserve_stacking(self):
274
271
        """With no stacking, preserve_stacking should be a no-op."""
275
 
        self.thisFailsStrictLockCheck()
276
272
        branch = self.make_branch('source')
277
273
        cloned_bzrdir = branch.bzrdir.clone('cloned', preserve_stacking=True)
278
274
        self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
309
305
        """Obey policy where possible, ignore otherwise."""
310
306
        if isinstance(self.branch_format, branch.BzrBranchFormat4):
311
307
            raise TestNotApplicable('Branch format 4 does not autoupgrade.')
312
 
        self.thisFailsStrictLockCheck()
313
308
        source = self.make_branch('source')
314
309
        stack_on = self.make_stacked_on_matching(source)
315
310
        parent_bzrdir = self.make_bzrdir('.', format='default')
467
462
        self.assertEqual(['../stack-on'], hook_calls)
468
463
 
469
464
    def test_stack_on_repository_branch(self):
470
 
        self.thisFailsStrictLockCheck()
471
465
        # Stacking should work when the repo isn't co-located with the
472
466
        # stack-on branch.
473
467
        try: