/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_cat_revision.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_cat_revision.py
41
41
            revs = {}
42
42
            for i in (1, 2, 3):
43
43
                revid = b"a@r-0-%d" % i
44
 
                stream = r.revisions.get_record_stream([(revid,)], 'unordered', 
45
 
                                                       False) 
 
44
                stream = r.revisions.get_record_stream([(revid,)], 'unordered',
 
45
                                                       False)
46
46
                revs[i] = next(stream).get_bytes_as('fulltext')
47
47
 
48
48
        for i in [1, 2, 3]:
49
49
            self.assertEqual(revs[i],
50
 
                self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0].encode('utf-8'))
51
 
            self.assertEqual(revs[i],
52
 
                self.run_bzr('cat-revision a@r-0-%d' % i)[0].encode('utf-8'))
53
 
            self.assertEqual(revs[i],
54
 
                self.run_bzr('cat-revision -r %d' % i)[0].encode('utf-8'))
 
50
                             self.run_bzr('cat-revision -r revid:a@r-0-%d' % i)[0].encode('utf-8'))
 
51
            self.assertEqual(revs[i],
 
52
                             self.run_bzr('cat-revision a@r-0-%d' % i)[0].encode('utf-8'))
 
53
            self.assertEqual(revs[i],
 
54
                             self.run_bzr('cat-revision -r %d' % i)[0].encode('utf-8'))
55
55
 
56
56
    def test_cat_no_such_revid(self):
57
57
        tree = self.make_branch_and_tree('.')
58
58
        err = self.run_bzr('cat-revision abcd', retcode=3)[1]
59
 
        self.assertContainsRe(err, 'The repository .* contains no revision abcd.')
 
59
        self.assertContainsRe(
 
60
            err, 'The repository .* contains no revision abcd.')
60
61
 
61
62
    def test_cat_revision_directory(self):
62
63
        """Test --directory option"""