Rev 4715: Clean up the test_conflicts file for newer apis. in http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

------------------------------------------------------------
revno: 4715
revision-id: john at arbash-meinel.com-20091208203025-0jdq8i2n7a1x2siq
parent: john at arbash-meinel.com-20091208202829-wuuzjx2xul8xzsrb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-40412-show-base-weave
timestamp: Tue 2009-12-08 14:30:25 -0600
message:
  Clean up the test_conflicts file for newer apis.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py	2009-12-08 20:28:29 +0000
+++ b/bzrlib/tests/test_merge_core.py	2009-12-08 20:30:25 +0000
@@ -467,17 +467,14 @@
         self.assertEqual("Mary\n", open("original/file2", "rt").read())
 
     def test_conflicts(self):
-        os.mkdir('a')
         wta = self.make_branch_and_tree('a')
-        a = wta.branch
-        file('a/file', 'wb').write('contents\n')
+        self.build_tree_contents([('a/file', 'contents\n')])
         wta.add('file')
         wta.commit('base revision', allow_pointless=False)
-        d_b = a.bzrdir.clone('b')
-        b = d_b.open_branch()
-        file('a/file', 'wb').write('other contents\n')
+        d_b = wta.branch.bzrdir.clone('b')
+        self.build_tree_contents([('a/file', 'other contents\n')])
         wta.commit('other revision', allow_pointless=False)
-        file('b/file', 'wb').write('this contents contents\n')
+        self.build_tree_contents([('b/file', 'this contents contents\n')])
         wtb = d_b.open_workingtree()
         wtb.commit('this revision', allow_pointless=False)
         self.assertEqual(1, wtb.merge_from_branch(wta.branch))