← 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

  • Committer: Robert Collins
  • Date: 2005-10-18 05:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: robertc@robertcollins.net-20051018052622-653d638c9e26fde4
fix broken tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_revision_info.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
 
 
18
from bzrlib.selftest import TestCaseInTempDir
19
19
from bzrlib.errors import BzrCommandError, NoSuchRevision
20
 
from bzrlib.tests import TestCaseWithTransport
 
20
from bzrlib.branch import Branch
21
21
from bzrlib.revisionspec import RevisionSpec
22
 
from bzrlib.workingtree import WorkingTree
23
 
 
24
 
 
25
 
class TestRevisionInfo(TestCaseWithTransport):
 
22
 
 
23
class TestRevisionInfo(TestCaseInTempDir):
26
24
    
27
25
    def check_error(self, output, *args):
28
26
        """Verify that the expected error matches what bzr says.
30
28
        The output is supplied first, so that you can supply a variable
31
29
        number of arguments to bzr.
32
30
        """
33
 
        self.assertContainsRe(self.run_bzr_captured(args, retcode=3)[1], output)
 
31
        self.assertEquals(self.run_bzr_captured(args, retcode=1)[1], output)
34
32
 
35
33
    def check_output(self, output, *args):
36
34
        """Verify that the expected output matches what bzr says.
41
39
        self.assertEquals(self.run_bzr_captured(args)[0], output)
42
40
 
43
41
    def test_revision_info(self):
44
 
        """Test that 'bzr revision-info' reports the correct thing."""
45
 
        wt = self.make_branch_and_tree('.')
46
 
 
47
 
        wt.commit('Commit one', rev_id='a@r-0-1')
48
 
        wt.commit('Commit two', rev_id='a@r-0-2')
49
 
        wt.commit('Commit three', rev_id='a@r-0-3')
 
42
        """Test that 'bzr revision-info' reports the correct thing.
 
43
        """
 
44
 
 
45
        b = Branch.initialize('.')
 
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')
50
50
 
51
51
        # Make sure revision-info without any arguments throws an exception
52
 
        self.check_error('bzr: ERROR: '
53
 
                         'You must supply a revision identifier\n',
 
52
        self.check_error('bzr: ERROR: You must supply a revision identifier\n',
54
53
                         'revision-info')
55
54
 
56
55
        values = {
85
84
    def test_cat_revision(self):
86
85
        """Test bzr cat-revision.
87
86
        """
88
 
        wt = self.make_branch_and_tree('.')
89
 
        r = wt.branch.repository
 
87
        b = Branch.initialize('.')
90
88
 
91
 
        wt.commit('Commit one', rev_id='a@r-0-1')
92
 
        wt.commit('Commit two', rev_id='a@r-0-2')
93
 
        wt.commit('Commit three', rev_id='a@r-0-3')
 
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')
94
92
 
95
93
        revs = {
96
 
            1:r.get_revision_xml('a@r-0-1'),
97
 
            2:r.get_revision_xml('a@r-0-2'),
98
 
            3:r.get_revision_xml('a@r-0-3'),
 
94
            1:b.get_revision_xml_file('a@r-0-1').read(),
 
95
            2:b.get_revision_xml_file('a@r-0-2').read(),
 
96
            3:b.get_revision_xml_file('a@r-0-3').read()
99
97
        }
100
98
 
101
99
        self.check_output(revs[1], 'cat-revision', 'a@r-0-1')