/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_testament.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Blackbox tests for the 'bzr testament' command"""
18
 
 
19
 
 
20
 
from bzrlib.tests.test_testament import (
 
17
"""Blackbox tests for the 'brz testament' command"""
 
18
 
 
19
import re
 
20
 
 
21
from breezy.sixish import PY3
 
22
from breezy.tests.test_testament import (
 
23
    osutils,
21
24
    REV_1_SHORT,
22
25
    REV_1_SHORT_STRICT,
23
26
    REV_2_TESTAMENT,
26
29
 
27
30
 
28
31
class TestTestament(TestamentSetup):
29
 
    """Run blackbox tests on 'bzr testament'"""
 
32
    """Run blackbox tests on 'brz testament'"""
30
33
 
31
34
    def test_testament_command(self):
32
35
        """Testament containing a file and a directory."""
33
36
        out, err = self.run_bzr('testament --long')
34
37
        self.assertEqualDiff(err, '')
35
 
        self.assertEqualDiff(out, REV_2_TESTAMENT)
 
38
        self.assertEqualDiff(out, REV_2_TESTAMENT.decode('utf-8'))
36
39
 
37
40
    def test_testament_command_2(self):
38
41
        """Command getting short testament of previous version."""
39
42
        out, err = self.run_bzr('testament -r1')
40
43
        self.assertEqualDiff(err, '')
41
 
        self.assertEqualDiff(out, REV_1_SHORT)
 
44
        self.assertEqualDiff(out, REV_1_SHORT.decode('utf-8'))
42
45
 
43
46
    def test_testament_command_3(self):
44
47
        """Command getting short testament of previous version."""
45
48
        out, err = self.run_bzr('testament -r1 --strict')
46
49
        self.assertEqualDiff(err, '')
47
 
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
 
50
        self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('utf-8'))
48
51
 
 
52
    def test_testament_non_ascii(self):
 
53
        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)
 
59
        sha1 = sha1_re.search(short_out).group('sha1')
 
60
        self.assertEqual(
 
61
            sha1.encode('ascii'),
 
62
            osutils.sha_string(long_out.encode('utf-8') if PY3 else long_out))