← 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: Jelmer Vernooij
  • Date: 2011-02-24 16:09:47 UTC
  • mto: (5582.10.69 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5688.
  • Revision ID: jelmer@samba.org-20110224160947-e7kqclxnjif28v5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_stacking.py
329
329
 
330
330
    def test_sprout_stacking_policy_handling(self):
331
331
        """Obey policy where possible, ignore otherwise."""
332
 
        if isinstance(self.branch_format, branch.BzrBranchFormat4):
 
332
        if self.bzrdir_format.fixed_components:
333
333
            raise TestNotApplicable('Branch format 4 does not autoupgrade.')
334
334
        source = self.make_branch('source')
335
335
        stack_on = self.make_stacked_on_matching(source)
346
346
 
347
347
    def test_clone_stacking_policy_handling(self):
348
348
        """Obey policy where possible, ignore otherwise."""
349
 
        if isinstance(self.branch_format, branch.BzrBranchFormat4):
 
349
        if self.bzrdir_format.fixed_components:
350
350
            raise TestNotApplicable('Branch format 4 does not autoupgrade.')
351
351
        source = self.make_branch('source')
352
352
        stack_on = self.make_stacked_on_matching(source)
363
363
 
364
364
    def test_sprout_to_smart_server_stacking_policy_handling(self):
365
365
        """Obey policy where possible, ignore otherwise."""
366
 
        if isinstance(self.branch_format, branch.BzrBranchFormat4):
367
 
            raise TestNotApplicable('Branch format 4 is not usable via HPSS.')
 
366
        if not self.branch_format.supports_leaving_lock():
 
367
            raise TestNotApplicable('Branch format is not usable via HPSS.')
368
368
        source = self.make_branch('source')
369
369
        stack_on = self.make_stacked_on_matching(source)
370
370
        parent_bzrdir = self.make_bzrdir('.', format='default')