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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_status.py
23
23
"""
24
24
 
25
25
import codecs
26
 
from io import (
27
 
    BytesIO,
28
 
    StringIO,
29
 
    )
30
26
from os import mkdir, chdir, rmdir, unlink
31
27
import sys
32
28
 
42
38
import breezy.branch
43
39
from ...osutils import pathjoin
44
40
from ...revisionspec import RevisionSpec
 
41
from ...sixish import (
 
42
    BytesIO,
 
43
    StringIO,
 
44
    PY3,
 
45
    )
45
46
from ...status import show_tree_status
46
47
from .. import TestCaseWithTransport, TestSkipped
47
48
from ...workingtree import WorkingTree
804
805
added:
805
806
  hell\u00d8
806
807
"""
 
808
        if not PY3:
 
809
            expected = expected.encode('latin-1')
807
810
        self.assertEqual(stdout, expected)