← 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: Canonical.com Patch Queue Manager
  • Date: 2009-08-14 15:22:39 UTC
  • mfrom: (4523.4.21 1.18-lock-warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20090814152239-m0ybwy7vfs32exeh
(jam) Update the test suite to cause failures when we take out
        multiple locks on the same file.

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()
229
230
        # We can clone from the bzrdir of a stacked branch. If
230
231
        # preserve_stacking is True, the cloned branch is stacked on the
231
232
        # same branch as the original.
242
243
            pass
243
244
 
244
245
    def test_clone_from_branch_stacked_on_relative_url_preserve_stacking(self):
 
246
        self.thisFailsStrictLockCheck()
245
247
        # If a branch's stacked-on url is relative, we can still clone
246
248
        # from it with preserve_stacking True and get a branch stacked
247
249
        # on an appropriately adjusted relative url.
256
258
            cloned_bzrdir.open_branch().get_stacked_on_url())
257
259
 
258
260
    def test_clone_from_stacked_branch_no_preserve_stacking(self):
 
261
        self.thisFailsStrictLockCheck()
259
262
        try:
260
263
            stacked_bzrdir = self.make_stacked_bzrdir()
261
264
        except unstackable_format_errors, e:
269
272
 
270
273
    def test_no_op_preserve_stacking(self):
271
274
        """With no stacking, preserve_stacking should be a no-op."""
 
275
        self.thisFailsStrictLockCheck()
272
276
        branch = self.make_branch('source')
273
277
        cloned_bzrdir = branch.bzrdir.clone('cloned', preserve_stacking=True)
274
278
        self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
289
293
 
290
294
    def test_clone_stacking_policy_handling(self):
291
295
        """Obey policy where possible, ignore otherwise."""
 
296
        self.thisFailsStrictLockCheck()
292
297
        stack_on = self.make_branch('stack-on')
293
298
        parent_bzrdir = self.make_bzrdir('.', format='default')
294
299
        parent_bzrdir.get_config().set_default_stack_on('stack-on')
442
447
        self.assertEqual(['../stack-on'], hook_calls)
443
448
 
444
449
    def test_stack_on_repository_branch(self):
 
450
        self.thisFailsStrictLockCheck()
445
451
        # Stacking should work when the repo isn't co-located with the
446
452
        # stack-on branch.
447
453
        try: