35
34
"""Testament containing a file and a directory."""
36
35
out, err = self.run_bzr('testament --long')
37
36
self.assertEqualDiff(err, '')
38
self.assertEqualDiff(out, REV_2_TESTAMENT.decode('utf-8'))
37
self.assertEqualDiff(out, REV_2_TESTAMENT.decode('ascii'))
40
39
def test_testament_command_2(self):
41
40
"""Command getting short testament of previous version."""
42
41
out, err = self.run_bzr('testament -r1')
43
42
self.assertEqualDiff(err, '')
44
self.assertEqualDiff(out, REV_1_SHORT.decode('utf-8'))
43
self.assertEqualDiff(out, REV_1_SHORT.decode('ascii'))
46
45
def test_testament_command_3(self):
47
46
"""Command getting short testament of previous version."""
48
47
out, err = self.run_bzr('testament -r1 --strict')
49
48
self.assertEqualDiff(err, '')
50
self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('utf-8'))
49
self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('ascii'))
52
51
def test_testament_non_ascii(self):
53
52
self.wt.commit(u"Non \xe5ssci message")
54
long_out, err = self.run_bzr('testament --long')
55
self.assertEqualDiff(err, '')
56
short_out, err = self.run_bzr('testament')
57
self.assertEqualDiff(err, '')
58
sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
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)
59
59
sha1 = sha1_re.search(short_out).group('sha1')
62
osutils.sha_string(long_out.encode('utf-8') if PY3 else long_out))
60
self.assertEqual(sha1, osutils.sha_string(long_out))