[MERGE] Convert tests.blackbox.test_merge to use internals where appropriate
Daniel Watkins
D.M.Watkins at warwick.ac.uk
Thu Aug 23 16:41:06 BST 2007
On Thu, 2007-08-23 at 11:30 -0400, Aaron Bentley wrote:
> The functionality looks good, just some formatting stuff.
Fixed in 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.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070823153939-\
# hizvo3hib1xhmfjq
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 6b6b6fb696c2be7bccf8f79a7b77c9444f9424f7
# timestamp: 2007-08-23 17:39:56 +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-23 15:39:39 +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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
-------------- 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/20070823/0b3ff0c5/attachment-0001.pgp
More information about the bazaar
mailing list