Rev 3912: Fix one more. in file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/selftest-stacking/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/selftest-stacking/

------------------------------------------------------------
revno: 3912
revision-id: v.ladeuil+lp at free.fr-20081218133425-yb5x8wz999jd9mx1
parent: v.ladeuil+lp at free.fr-20081218125528-5o7zgs3pkd2rq71n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-stacking
timestamp: Thu 2008-12-18 14:34:25 +0100
message:
  Fix one more.
  
  * bzrlib/tests/branch_implementations/test_push.py:
  (TestPush.test_push_with_default_stacking_does_not_create_broken_branch):
  Not applicable to unstackable branch formats.
-------------- next part --------------
=== modified file 'bzrlib/tests/branch_implementations/test_push.py'
--- a/bzrlib/tests/branch_implementations/test_push.py	2008-12-16 04:13:39 +0000
+++ b/bzrlib/tests/branch_implementations/test_push.py	2008-12-18 13:34:25 +0000
@@ -187,8 +187,9 @@
         default for the branch), and will be stacked when the repo format
         allows (which means that the branch format isn't necessarly preserved).
         """
-        if isinstance(self.branch_format, branch.BzrBranchFormat4):
-            raise tests.TestNotApplicable('Not a metadir format.')
+        if not self.branch_format.supports_stacking():
+            raise tests.TestNotApplicable('%r does not support stacking'
+                                    % self.branch_format)
         if isinstance(self.branch_format, branch.BranchReferenceFormat):
             # This test could in principle apply to BranchReferenceFormat, but
             # make_branch_builder doesn't support it.