Rev 5642: Delete one more import. in file:///home/vila/src/bzr/reviews/537442-annotate-removed/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/537442-annotate-removed/

------------------------------------------------------------
revno: 5642
revision-id: v.ladeuil+lp at free.fr-20110209083708-urq75zgwremz1gg2
parent: v.ladeuil+lp at free.fr-20110209082817-gdeafi4f4s9vdh11
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 537442-annotate-removed
timestamp: Wed 2011-02-09 09:37:08 +0100
message:
  Delete one more import.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- a/bzrlib/tests/blackbox/test_annotate.py	2011-02-09 08:28:17 +0000
+++ b/bzrlib/tests/blackbox/test_annotate.py	2011-02-09 08:37:08 +0000
@@ -26,7 +26,6 @@
 
 from bzrlib import tests
 
-from bzrlib.branch import Branch
 from bzrlib.config import extract_email_address
 from bzrlib.urlutils import joinpath
 
@@ -210,11 +209,12 @@
         tree.merge_from_branch(tree.branch, "rev1.1.1")
         # edit the file to be 'resolved' and have a further local edit
         self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
+        return tree
 
     def test_annotated_edited_merged_file_revnos(self):
-        self._create_merged_file()
-        out, err = self.run_bzr('annotate file')
-        email = extract_email_address(Branch.open('.').get_config().username())
+        wt = self._create_merged_file()
+        out, err = self.run_bzr(['annotate', 'file'])
+        email = extract_email_address(wt.branch.get_config().username())
         self.assertEqual(
             '3?    %-7s | local\n'
             '1     test at ho | foo\n'
@@ -225,7 +225,7 @@
 
     def test_annotated_edited_merged_file_ids(self):
         self._create_merged_file()
-        out, err = self.run_bzr('annotate file --show-ids')
+        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
         self.assertEqual(
             'current: | local\n'
             '    rev1 | foo\n'