Rev 2704: Clean up tests for find-merge-base (Daniel Watkins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2704
revision-id: pqm at pqm.ubuntu.com-20070815145844-2vp9dc8e2nz8qusk
parent: pqm at pqm.ubuntu.com-20070815125647-dx6if7e1osu5fnze
parent: abentley at panoramicfeedback.com-20070815132559-j26r82cjpcec66n6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-15 15:58:44 +0100
message:
  Clean up tests for find-merge-base (Daniel Watkins)
modified:
  bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
    ------------------------------------------------------------
    revno: 2664.5.2
    merged: abentley at panoramicfeedback.com-20070815132559-j26r82cjpcec66n6
    parent: d.m.watkins at warwick.ac.uk-20070803160142-rak3xh6drbu9d5s1
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Wed 2007-08-15 09:25:59 -0400
    message:
      Fix up imports
    ------------------------------------------------------------
    revno: 2664.5.1
    merged: d.m.watkins at warwick.ac.uk-20070803160142-rak3xh6drbu9d5s1
    parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: fix-blackbox-tests
    timestamp: Fri 2007-08-03 17:01:42 +0100
    message:
      tests.blackbox.test_find_merge_base now uses internals where appropriate.
=== modified file 'bzrlib/tests/blackbox/test_find_merge_base.py'
--- a/bzrlib/tests/blackbox/test_find_merge_base.py	2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_find_merge_base.py	2007-08-15 13:25:59 +0000
@@ -14,23 +14,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+import os
+
 from bzrlib.tests.blackbox import ExternalBase
-import os
 
 
 class TestFindMergeBase(ExternalBase):
 
     def test_find_merge_base(self):
-        os.mkdir('a')
-        os.chdir('a')
-        self.run_bzr('init')
-        self.run_bzr('commit -m foo --unchanged')
-        self.run_bzr('branch . ../b')
-        q = self.run_bzr('find-merge-base . ../b')[0]
-        self.run_bzr('commit -m bar --unchanged')
-        os.chdir('../b')
-        self.run_bzr('commit -m baz --unchanged')
-        r = self.run_bzr('find-merge-base . ../a')[0]
+        a_tree = self.make_branch_and_tree('a')
+        a_tree.commit(message='foo', allow_pointless=True)
+        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
+        q = self.run_bzr('find-merge-base a b')[0]
+        a_tree.commit(message='bar', allow_pointless=True)
+        b_tree.commit(message='baz', allow_pointless=True)
+        r = self.run_bzr('find-merge-base b a')[0]
         self.assertEqual(q, r)
         
     def test_find_null_merge_base(self):