← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_annotate.py

Update test support, and remove deprecated functions pullable_revisions and get_intervening_revisions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
46
46
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
47
47
                                  ('nomail.txt', 'nomail\n')])
48
48
        wt.add(['hello.txt'])
49
 
        wt.commit('add hello', 
50
 
                                committer='test@user')
 
49
        wt.commit('add hello', committer='test@user')
51
50
        wt.add(['nomail.txt'])
52
51
        wt.commit('add nomail', committer='no mail')
 
52
        file('hello.txt', 'ab').write('your helicopter')
 
53
        wt.commit('mod hello', committer='user@test')
53
54
 
54
55
    def test_help_annotate(self):
55
56
        """Annotate command exists"""
60
61
        self.assertEquals(err, '')
61
62
        self.assertEqualDiff(out, '''\
62
63
    1 test@us | my helicopter
 
64
    3 user@te | your helicopter
63
65
''')
64
66
 
65
67
    def test_no_mail(self):
68
70
        self.assertEqualDiff(out, '''\
69
71
    2 no mail | nomail
70
72
''')
 
73
 
 
74
    def test_annotate_cmd_revision(self):
 
75
        out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r 1'])
 
76
        self.assertEquals(err, '')
 
77
        self.assertEqualDiff(out, '''\
 
78
    1 test@us | my helicopter
 
79
''')
 
80
 
 
81
    def test_annotate_cmd_revision3(self):
 
82
        out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r 3'])
 
83
        self.assertEquals(err, '')
 
84
        self.assertEqualDiff(out, '''\
 
85
    1 test@us | my helicopter
 
86
    3 user@te | your helicopter
 
87
''')
 
88
 
 
89
    def test_annotate_cmd_unknown_revision(self):
 
90
        out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r 10'],
 
91
                                         retcode=3)
 
92
        self.assertEquals(out, '')
 
93
        self.assertContainsRe(err, 'has no revision 10')
 
94
 
 
95
    def test_annotate_cmd_two_revisions(self):
 
96
        out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r 1..2'],
 
97
                                         retcode=3)
 
98
        self.assertEquals(out, '')
 
99
        self.assertEquals(err, 'bzr: ERROR: bzr annotate --revision takes'
 
100
                               ' exactly 1 argument\n')