← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_push.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_push.py
209
209
        default for the branch), and will be stacked when the repo format
210
210
        allows (which means that the branch format isn't necessarly preserved).
211
211
        """
212
 
        if isinstance(self.branch_format, branch.BzrBranchFormat4):
 
212
        if self.bzrdir_format.fixed_components:
213
213
            raise tests.TestNotApplicable('Not a metadir format.')
214
214
        if isinstance(self.branch_format, branch.BranchReferenceFormat):
215
215
            # This test could in principle apply to BranchReferenceFormat, but
350
350
            raise tests.TestNotApplicable(
351
351
                'Does not apply when remote backing branch is also '
352
352
                'a smart branch')
353
 
        if isinstance(self.branch_format, branch.BzrBranchFormat4):
 
353
        if not self.branch_format.supports_leaving_lock():
354
354
            raise tests.TestNotApplicable(
355
 
                'Branch format 4 is not usable via HPSS.')
 
355
                'Branch format is not usable via HPSS.')
356
356
        super(EmptyPushSmartEffortTests, self).setUp()
357
357
        # Create a smart server that publishes whatever the backing VFS server
358
358
        # does.