← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_revision_info.py

[merge] much integrated work from robert and john

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_revision_info.py
28
28
        The output is supplied first, so that you can supply a variable
29
29
        number of arguments to bzr.
30
30
        """
31
 
        self.assertEquals(self.run_bzr_captured(args, retcode=3)[1], output)
 
31
        self.assertContainsRe(self.run_bzr_captured(args, retcode=3)[1], output)
32
32
 
33
33
    def check_output(self, output, *args):
34
34
        """Verify that the expected output matches what bzr says.
44
44
 
45
45
        b = Branch.initialize('.')
46
46
 
47
 
        b.commit('Commit one', rev_id='a@r-0-1')
48
 
        b.commit('Commit two', rev_id='a@r-0-2')
49
 
        b.commit('Commit three', rev_id='a@r-0-3')
 
47
        b.working_tree().commit('Commit one', rev_id='a@r-0-1')
 
48
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
 
49
        b.working_tree().commit('Commit three', rev_id='a@r-0-3')
50
50
 
51
51
        # Make sure revision-info without any arguments throws an exception
52
 
        self.check_error('bzr: ERROR: You must supply a revision identifier\n',
 
52
        self.check_error('bzr: ERROR: bzrlib.errors.BzrCommandError: '
 
53
                         'You must supply a revision identifier\n',
53
54
                         'revision-info')
54
55
 
55
56
        values = {
86
87
        """
87
88
        b = Branch.initialize('.')
88
89
 
89
 
        b.commit('Commit one', rev_id='a@r-0-1')
90
 
        b.commit('Commit two', rev_id='a@r-0-2')
91
 
        b.commit('Commit three', rev_id='a@r-0-3')
 
90
        b.working_tree().commit('Commit one', rev_id='a@r-0-1')
 
91
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
 
92
        b.working_tree().commit('Commit three', rev_id='a@r-0-3')
92
93
 
93
94
        revs = {
94
95
            1:b.get_revision_xml_file('a@r-0-1').read(),