Rev 3911: Fix test applicability. 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: 3911
revision-id: v.ladeuil+lp at free.fr-20081218125528-5o7zgs3pkd2rq71n
parent: pqm at pqm.ubuntu.com-20081217102138-pz7pfli9o3k50zq7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-stacking
timestamp: Thu 2008-12-18 13:55:28 +0100
message:
  Fix test applicability.
  
  * bzrlib/tests/branch_implementations/test_stacking.py:
  (TestStacking.test_sprout_stacking_policy_handling): sprout can
  raise UnstackableBranchFormat.
  (TestStacking.test_clone_stacking_policy_handling): clone can
  raise UnstackableBranchFormat.
  (TestStacking.test_stack_on_repository_branch): Not applicable to
  	
-------------- next part --------------
=== modified file 'bzrlib/tests/branch_implementations/test_stacking.py'
--- a/bzrlib/tests/branch_implementations/test_stacking.py	2008-12-01 23:50:52 +0000
+++ b/bzrlib/tests/branch_implementations/test_stacking.py	2008-12-18 12:55:28 +0000
@@ -263,11 +263,11 @@
         parent_bzrdir = self.make_bzrdir('.', format='default')
         parent_bzrdir.get_config().set_default_stack_on('stack-on')
         source = self.make_branch('source')
-        target = source.bzrdir.sprout('target').open_branch()
         try:
+            target = source.bzrdir.sprout('target').open_branch()
             self.assertEqual('../stack-on', target.get_stacked_on_url())
-        except errors.UnstackableBranchFormat:
-            pass
+        except errors.UnstackableBranchFormat, e:
+            raise TestNotApplicable(e)
 
     def test_clone_stacking_policy_handling(self):
         """Obey policy where possible, ignore otherwise."""
@@ -275,11 +275,11 @@
         parent_bzrdir = self.make_bzrdir('.', format='default')
         parent_bzrdir.get_config().set_default_stack_on('stack-on')
         source = self.make_branch('source')
-        target = source.bzrdir.clone('target').open_branch()
         try:
+            target = source.bzrdir.clone('target').open_branch()
             self.assertEqual('../stack-on', target.get_stacked_on_url())
-        except errors.UnstackableBranchFormat:
-            pass
+        except errors.UnstackableBranchFormat, e:
+            raise TestNotApplicable(e)
 
     def prepare_stacked_on_fetch(self):
         stack_on = self.make_branch_and_tree('stack-on')
@@ -407,6 +407,9 @@
         self.assertEqual(['../stack-on'], hook_calls)
 
     def test_stack_on_repository_branch(self):
+        if not self.branch_format.supports_stacking():
+            raise TestNotApplicable('%r does not support stacking'
+                                    % self.branch_format)
         # Stacking should work when the repo isn't co-located with the
         # stack-on branch.
         try:
@@ -415,10 +418,7 @@
             raise TestNotApplicable()
         # Avoid make_branch, which produces standalone branches.
         bzrdir = self.make_bzrdir('repo/stack-on')
-        try:
-            b = bzrdir.create_branch()
-        except errors.UninitializableFormat:
-            raise TestNotApplicable()
+        b = bzrdir.create_branch()
         transport = self.get_transport('stacked')
         b.bzrdir.clone_on_transport(transport, stacked_on=b.base)
         # Ensure that opening the branch doesn't raise.