~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-02 14:58:47 UTC
  • mfrom: (5554.1.3 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101202145847-fw822sd3nyhvrwmi
(vila) Merge 2.2 into trunk including fix for bug #583667 and bug
        #681885 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Blackbox tests for the 'bzr testament' command"""
18
18
 
19
 
import re
20
19
 
21
20
from bzrlib.tests.test_testament import (
22
 
    osutils,
23
21
    REV_1_SHORT,
24
22
    REV_1_SHORT_STRICT,
25
23
    REV_2_TESTAMENT,
48
46
        self.assertEqualDiff(err, '')
49
47
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
50
48
 
51
 
    def test_testament_non_ascii(self):
52
 
        self.wt.commit(u"Non \xe5ssci message")
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)
58
 
        sha1 = sha1_re.search(short_out).group('sha1')
59
 
        self.assertEqual(sha1, osutils.sha_string(long_out))