No subject
Fri Nov 28 17:05:26 GMT 2008
unstackable branch format that pass the test suite, I modified
loom to be explicit about that. (Since it didn't pass the test
suite I thought it was a valid modification until loom support
stacking).
I had to modify some tests to reach that point.
I also fixed a typo in test_osutils.TestChunksToLines.test_is_compiled.
Vincent
P.S.: I missed one failing test in my previous submission, bad
vila, stop abusing 'selftest -s' :)
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=selftest-stacking-3913.patch
Content-Description: BZR merge
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: v.ladeuil+lp at free.fr-20081218142401-m1wr8r70u051aym6
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: a0eae307d29aaf6514434d6c229020bd7a1d9d8b
# timestamp: 2008-12-18 15:24:19 +0100
# base_revision_id: pqm at pqm.ubuntu.com-20081217102138-pz7pfli9o3k50zq7
#
# Begin patch
=== modified file 'bzrlib/tests/branch_implementations/test_push.py'
--- bzrlib/tests/branch_implementations/test_push.py 2008-12-16 04:13:39 +0000
+++ 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.
=== modified file 'bzrlib/tests/branch_implementations/test_stacking.py'
--- bzrlib/tests/branch_implementations/test_stacking.py 2008-12-01 23:50:52 +0000
+++ 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.
=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py 2008-12-11 03:08:03 +0000
+++ bzrlib/tests/test_osutils.py 2008-12-18 14:24:01 +0000
@@ -765,8 +765,8 @@
osutils.chunks_to_lines(['foo\n', 'bar\n', 'baz\n']))
def test_is_compiled(self):
- from bzrlib.tests.test__chunks_to_lines import CompiledChunksToLinesFeature
- if CompiledChunksToLinesFeature:
+ from bzrlib.tests import test__chunks_to_lines
+ if test__chunks_to_lines.CompiledChunksToLinesFeature.available():
from bzrlib._chunks_to_lines_pyx import chunks_to_lines
else:
from bzrlib._chunks_to_lines_py import chunks_to_lines
# Begin bundle
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
--=-=-=--
More information about the bazaar
mailing list