Rev 5641: Freshen up the tests to a more modern style. in file:///home/vila/src/bzr/reviews/537442-annotate-removed/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5641
revision-id: v.ladeuil+lp at free.fr-20110209082817-gdeafi4f4s9vdh11
parent: eurokang at gmail.com-20110210080517-7xya44a9akpica0n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 537442-annotate-removed
timestamp: Wed 2011-02-09 09:28:17 +0100
message:
  Freshen up the tests to a more modern style.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- a/bzrlib/tests/blackbox/test_annotate.py	2011-02-09 11:44:03 +0000
+++ b/bzrlib/tests/blackbox/test_annotate.py	2011-02-09 08:28:17 +0000
@@ -24,15 +24,14 @@
 """
 
 
-import os
+from bzrlib import tests
 
 from bzrlib.branch import Branch
 from bzrlib.config import extract_email_address
-from bzrlib.tests import TestCaseWithTransport
 from bzrlib.urlutils import joinpath
 
 
-class TestAnnotate(TestCaseWithTransport):
+class TestAnnotate(tests.TestCaseWithTransport):
 
     def setUp(self):
         super(TestAnnotate, self).setUp()
@@ -151,7 +150,7 @@
                          err)
 
 
-class TestSimpleAnnotate(TestCaseWithTransport):
+class TestSimpleAnnotate(tests.TestCaseWithTransport):
     """Annotate tests with no complex setup."""
 
     def _setup_edited_file(self, relpath='.'):
@@ -168,8 +167,8 @@
     def test_annotate_cmd_revspec_branch(self):
         tree = self._setup_edited_file('trunk')
         tree.branch.create_checkout(self.get_url('work'), lightweight=True)
-        os.chdir('work')
-        out, err = self.run_bzr('annotate file -r branch:../trunk')
+        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
+                                working_dir='work')
         self.assertEqual('', err)
         self.assertEqual(
             '1   test at ho | foo\n'
@@ -236,60 +235,50 @@
             out)
 
     def test_annotate_empty_file(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/empty', '')])
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('empty', '')])
         tree.add('empty')
         tree.commit('add empty file')
-
-        os.chdir('tree')
-        out, err = self.run_bzr('annotate empty')
+        out, err = self.run_bzr(['annotate', 'empty'])
         self.assertEqual('', out)
 
     def test_annotate_removed_file(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/empty', '')])
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('empty', '')])
         tree.add('empty')
         tree.commit('add empty file')
         # delete the file.
         tree.remove('empty')
         tree.commit('remove empty file')
-        
-        os.chdir('tree')
-        out, err = self.run_bzr('annotate -r1 empty')
+        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
         self.assertEqual('', out)
 
     def test_annotate_empty_file_show_ids(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/empty', '')])
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('empty', '')])
         tree.add('empty')
         tree.commit('add empty file')
-
-        os.chdir('tree')
         out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
         self.assertEqual('', out)
 
     def test_annotate_nonexistant_file(self):
-        tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/file'])
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['file'])
         tree.add(['file'])
         tree.commit('add a file')
-
-        os.chdir('tree')
-        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
+        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
         self.assertEqual('', out)
         self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
 
     def test_annotate_without_workingtree(self):
-        tree = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/empty', '')])
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('empty', '')])
         tree.add('empty')
         tree.commit('add empty file')
         bzrdir = tree.branch.bzrdir
         bzrdir.destroy_workingtree()
         self.assertFalse(bzrdir.has_workingtree())
-
-        os.chdir('branch')
-        out, err = self.run_bzr('annotate empty')
+        out, err = self.run_bzr(['annotate', 'empty'])
         self.assertEqual('', out)
 
     def test_annotate_directory(self):
@@ -298,5 +287,5 @@
         self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
         wt.add(['hello.txt'])
         wt.commit('commit', committer='test at user')
-        out, err = self.run_bzr('annotate -d a hello.txt')
+        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
         self.assertEqualDiff('1   test at us | my helicopter\n', out)