/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_testament.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_testament.py
18
18
 
19
19
import re
20
20
 
21
 
from breezy.bzr.tests.test_testament import (
 
21
from breezy.tests.test_testament import (
22
22
    osutils,
23
23
    REV_1_SHORT,
24
24
    REV_1_SHORT_STRICT,
34
34
        """Testament containing a file and a directory."""
35
35
        out, err = self.run_bzr('testament --long')
36
36
        self.assertEqualDiff(err, '')
37
 
        self.assertEqualDiff(out, REV_2_TESTAMENT.decode('ascii'))
 
37
        self.assertEqualDiff(out, REV_2_TESTAMENT)
38
38
 
39
39
    def test_testament_command_2(self):
40
40
        """Command getting short testament of previous version."""
41
41
        out, err = self.run_bzr('testament -r1')
42
42
        self.assertEqualDiff(err, '')
43
 
        self.assertEqualDiff(out, REV_1_SHORT.decode('ascii'))
 
43
        self.assertEqualDiff(out, REV_1_SHORT)
44
44
 
45
45
    def test_testament_command_3(self):
46
46
        """Command getting short testament of previous version."""
47
47
        out, err = self.run_bzr('testament -r1 --strict')
48
48
        self.assertEqualDiff(err, '')
49
 
        self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('ascii'))
 
49
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
50
50
 
51
51
    def test_testament_non_ascii(self):
52
52
        self.wt.commit(u"Non \xe5ssci message")
53
 
        long_out, err = self.run_bzr_raw('testament --long', encoding='utf-8')
54
 
        self.assertEqualDiff(err, b'')
55
 
        long_out, err = self.run_bzr_raw('testament --long', encoding='ascii')
56
 
        short_out, err = self.run_bzr_raw('testament', encoding='ascii')
57
 
        self.assertEqualDiff(err, b'')
58
 
        sha1_re = re.compile(b'sha1: (?P<sha1>[a-f0-9]+)$', re.M)
 
53
        long_out, err = self.run_bzr('testament --long')
 
54
        self.assertEqualDiff(err, '')
 
55
        short_out, err = self.run_bzr('testament')
 
56
        self.assertEqualDiff(err, '')
 
57
        sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
59
58
        sha1 = sha1_re.search(short_out).group('sha1')
60
59
        self.assertEqual(sha1, osutils.sha_string(long_out))