← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/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
 
from bzrlib.selftest import TestCaseInTempDir
 
18
from bzrlib.tests import TestCaseInTempDir
19
19
from bzrlib.errors import BzrCommandError, NoSuchRevision
20
20
from bzrlib.branch import Branch
21
21
from bzrlib.revisionspec import RevisionSpec
42
42
        """Test that 'bzr revision-info' reports the correct thing.
43
43
        """
44
44
 
45
 
        b = Branch.initialize('.')
 
45
        b = Branch.initialize(u'.')
46
46
 
47
47
        b.working_tree().commit('Commit one', rev_id='a@r-0-1')
48
48
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
49
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: bzrlib.errors.BzrCommandError: '
 
52
        self.check_error('bzr: ERROR: '
53
53
                         'You must supply a revision identifier\n',
54
54
                         'revision-info')
55
55
 
85
85
    def test_cat_revision(self):
86
86
        """Test bzr cat-revision.
87
87
        """
88
 
        b = Branch.initialize('.')
 
88
        b = Branch.initialize(u'.')
89
89
 
90
90
        b.working_tree().commit('Commit one', rev_id='a@r-0-1')
91
91
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
92
92
        b.working_tree().commit('Commit three', rev_id='a@r-0-3')
93
93
 
94
94
        revs = {
95
 
            1:b.get_revision_xml_file('a@r-0-1').read(),
96
 
            2:b.get_revision_xml_file('a@r-0-2').read(),
97
 
            3:b.get_revision_xml_file('a@r-0-3').read()
 
95
            1:b.get_revision_xml('a@r-0-1'),
 
96
            2:b.get_revision_xml('a@r-0-2'),
 
97
            3:b.get_revision_xml('a@r-0-3')
98
98
        }
99
99
 
100
100
        self.check_output(revs[1], 'cat-revision', 'a@r-0-1')