[MERGE] Convert tests.blackbox.test_merge to use internals where appropriate
Daniel Watkins
D.M.Watkins at warwick.ac.uk
Thu Aug 23 18:56:00 BST 2007
On Thu, 2007-08-23 at 12:01 -0400, Aaron Bentley wrote:
> ^^^ tuples, lists, etc, don't generally have spaces after trailing
> commas. No PEP8 on that, but repr(('hello', )) produces "('hello',)"
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-20070823175413-\
# x5lmokcirkg57fzm
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 169e2e868211a6db9de50f180b5124afa0191c84
# timestamp: 2007-08-23 19:54:42 +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 17:54:13 +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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
DCQUfuA=
-------------- 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/c097a856/attachment-0001.pgp
More information about the bazaar
mailing list