[MERGE] Convert tests.blackbox.test_merge to use internals where appropriate
Daniel Watkins
D.M.Watkins at warwick.ac.uk
Tue Aug 21 14:15:41 BST 2007
On Wed, 2007-08-08 at 09:24 -0400, Aaron Bentley wrote:
> BB:resubmit
Attached.
--
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.19)
# revision_id: d.m.watkins at warwick.ac.uk-20070821131246-\
# m8w0kwn21umvuj0e
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 8346f4100abd9dbbc84ec5560900f3ef18957870
# timestamp: 2007-08-21 15:14:23 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070821044713-ttnupbvhlsbwh1he
#
# Begin patch
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- bzrlib/tests/blackbox/test_merge.py 2007-08-13 12:48:50 +0000
+++ bzrlib/tests/blackbox/test_merge.py 2007-08-21 13:12:46 +0000
@@ -25,7 +25,7 @@
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
from bzrlib.conflicts import ConflictList, ContentsConflict
-from bzrlib.osutils import abspath, file_kind
+from bzrlib.osutils import abspath, file_kind, pathjoin
from bzrlib.tests.blackbox import ExternalBase
import bzrlib.urlutils as urlutils
from bzrlib.workingtree import WorkingTree
@@ -33,14 +33,16 @@
class TestMerge(ExternalBase):
- def example_branch(test):
- test.run_bzr('init')
- file('hello', 'wt').write('foo')
- test.run_bzr('add hello')
- test.run_bzr('commit -m setup hello')
- file('goodbye', 'wt').write('baz')
- test.run_bzr('add goodbye')
- test.run_bzr('commit -m setup goodbye')
+ def example_branch(self, path='.'):
+ tree = self.make_branch_and_tree(path)
+ self.build_tree_contents([
+ (pathjoin(path, 'hello'), 'foo'),
+ (pathjoin(path, 'goodbye'), 'baz')])
+ tree.add('hello')
+ tree.commit(message='setup')
+ tree.add('goodbye')
+ tree.commit(message='setup')
+ return tree
def test_merge_reprocess(self):
d = BzrDir.create_standalone_workingtree('.')
@@ -49,35 +51,31 @@
def test_merge(self):
from bzrlib.branch import Branch
-
- os.mkdir('a')
- os.chdir('a')
- self.example_branch()
- ancestor = Branch.open('.').revno()
- os.chdir('..')
- self.run_bzr('branch a b')
- os.chdir('b')
- file('goodbye', 'wt').write('quux')
- self.run_bzr(['commit', '-m', "more u's are always good"])
-
- os.chdir('../a')
- file('hello', 'wt').write('quuux')
+
+ a_tree = self.example_branch('a')
+ ancestor = a_tree.branch.revno()
+ b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
+ self.build_tree_contents([('b/goodbye', 'quux')])
+ b_tree.commit(message="more u's are always good")
+
+ self.build_tree_contents([('a/hello', 'quuux')])
# We can't merge when there are in-tree changes
+ os.chdir('a')
self.run_bzr('merge ../b', retcode=3)
a = WorkingTree.open('.')
a_tip = a.commit("Like an epidemic of u's")
self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
retcode=3)
self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
- self.run_bzr('revert --no-backup')
+ a_tree.revert([], backups=False)
self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
- self.run_bzr('revert --no-backup')
+ a_tree.revert([], backups=False)
self.run_bzr_error(['Show-base is not supported for this merge type'],
'merge ../b -r last:1..last:1 --merge-type weave'
' --show-base')
- self.run_bzr('revert --no-backup')
+ a_tree.revert([], backups=False)
self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
- self.run_bzr('revert --no-backup')
+ a_tree.revert([], backups=False)
self.run_bzr('merge ../b -r last:1')
self.check_file_contents('goodbye', 'quux')
# Merging a branch pulls its revision into the tree
@@ -85,7 +83,7 @@
b_tip = b.last_revision()
self.failUnless(a.branch.repository.has_revision(b_tip))
self.assertEqual([a_tip, b_tip], a.get_parent_ids())
- self.run_bzr('revert --no-backup')
+ a_tree.revert([], backups=False)
out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
self.assertTrue("Not a branch" in err)
self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
@@ -93,7 +91,7 @@
self.assertEquals(a.get_parent_ids(),
[a.branch.last_revision(), b.last_revision()])
self.check_file_contents('goodbye', 'quux')
- self.run_bzr('revert --no-backup')
+ a_tree.revert([], backups=False)
self.run_bzr('merge -r revno:%d:../b'%b.revno())
self.assertEquals(a.get_parent_ids(),
[a.branch.last_revision(), b.last_revision()])
@@ -103,37 +101,39 @@
def test_merge_with_missing_file(self):
"""Merge handles missing file conflicts"""
- os.mkdir('a')
- os.chdir('a')
- os.mkdir('sub')
- print >> file('sub/a.txt', 'wb'), "hello"
- print >> file('b.txt', 'wb'), "hello"
- print >> file('sub/c.txt', 'wb'), "hello"
- self.run_bzr('init')
- self.run_bzr('add')
- self.run_bzr(['commit', '-m', 'added a'])
- self.run_bzr('branch . ../b')
- print >> file('sub/a.txt', 'ab'), "there"
- print >> file('b.txt', 'ab'), "there"
- print >> file('sub/c.txt', 'ab'), "there"
- self.run_bzr(['commit', '-m', 'Added there'])
- os.unlink('sub/a.txt')
- os.unlink('sub/c.txt')
- os.rmdir('sub')
- os.unlink('b.txt')
- self.run_bzr(['commit', '-m', 'Removed a.txt'])
- os.chdir('../b')
- print >> file('sub/a.txt', 'ab'), "something"
- print >> file('b.txt', 'ab'), "something"
- print >> file('sub/c.txt', 'ab'), "something"
- self.run_bzr(['commit', '-m', 'Modified a.txt'])
+ self.build_tree_contents([
+ ('a/', ),
+ ('a/sub/', ),
+ ('a/sub/a.txt', 'hello\n'),
+ ('a/b.txt', 'hello\n'),
+ ('a/sub/c.txt', 'hello\n')])
+ a_tree = self.make_branch_and_tree('a')
+ a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
+ a_tree.commit(message='added a')
+ b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
+ self.build_tree_contents([
+ ('a/sub/a.txt', 'hello\nthere\n'),
+ ('a/b.txt', 'hello\nthere\n'),
+ ('a/sub/c.txt', 'hello\nthere\n')])
+ a_tree.commit(message='Added there')
+ os.remove('a/sub/a.txt')
+ os.remove('a/sub/c.txt')
+ os.rmdir('a/sub')
+ os.remove('a/b.txt')
+ a_tree.commit(message='Removed a.txt')
+ self.build_tree_contents([
+ ('b/sub/a.txt', 'hello\nsomething\n'),
+ ('b/b.txt', 'hello\nsomething\n'),
+ ('b/sub/c.txt', 'hello\nsomething\n')])
+ b_tree.commit(message='Modified a.txt')
+ os.chdir('b')
self.run_bzr('merge ../a/', retcode=1)
- self.assert_(os.path.exists('sub/a.txt.THIS'))
- self.assert_(os.path.exists('sub/a.txt.BASE'))
+ self.failUnlessExists('sub/a.txt.THIS')
+ self.failUnlessExists('sub/a.txt.BASE')
os.chdir('../a')
self.run_bzr('merge ../b/', retcode=1)
- self.assert_(os.path.exists('sub/a.txt.OTHER'))
- self.assert_(os.path.exists('sub/a.txt.BASE'))
+ self.failUnlessExists('sub/a.txt.OTHER')
+ self.failUnlessExists('sub/a.txt.BASE')
def test_merge_remember(self):
"""Merge changes from one branch to another and test parent location."""
@@ -192,21 +192,15 @@
def test_merge_bundle(self):
from bzrlib.testament import Testament
tree_a = self.make_branch_and_tree('branch_a')
- f = file('branch_a/a', 'wb')
- f.write('hello')
- f.close()
+ self.build_tree_contents([('branch_a/a', 'hello')])
tree_a.add('a')
tree_a.commit('message')
tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
- f = file('branch_a/a', 'wb')
- f.write('hey there')
- f.close()
+ self.build_tree_contents([('branch_a/a', 'hey there')])
tree_a.commit('message')
- f = file('branch_b/a', 'wb')
- f.write('goodbye')
- f.close()
+ self.build_tree_contents([('branch_b/a', 'goodbye')])
tree_b.commit('message')
os.chdir('branch_b')
self.run_bzr('bundle ../branch_a -o ../bundle')
@@ -246,22 +240,11 @@
'merge /a --uncommitted -r1 -d b')
def pullable_branch(self):
- os.mkdir('a')
- os.chdir('a')
- self.example_branch()
- os.chdir('..')
- self.run_bzr('branch a b')
- os.chdir('b')
- file('goodbye', 'wt').write('quux')
- self.run_bzr(['commit', '-m', "mode u's are always good"])
- os.chdir('../a')
-
- def pullable_branch(self):
tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/file'])
tree_a.add(['file'])
self.id1 = tree_a.commit('commit 1')
-
+
tree_b = self.make_branch_and_tree('b')
tree_b.pull(tree_a.branch)
file('b/file', 'wb').write('foo')
# Begin bundle
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
inChIchzdnI=
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070821/66bd3143/attachment-0001.pgp
More information about the bazaar
mailing list