/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/test_xml.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/test_xml.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
 
from io import BytesIO
18
17
 
19
18
from .. import (
20
19
    errors,
26
25
    xml7,
27
26
    xml8,
28
27
    )
 
28
from ..sixish import (
 
29
    BytesIO,
 
30
    text_type,
 
31
    )
29
32
from ..bzr.inventory import Inventory
30
33
from . import TestCase
31
34
import breezy.bzr.xml5
488
491
        for parent_id in rev.parent_ids:
489
492
            self.assertIsInstance(parent_id, bytes)
490
493
        self.assertEqual(u'Include \xb5nicode characters\n', rev.message)
491
 
        self.assertIsInstance(rev.message, str)
 
494
        self.assertIsInstance(rev.message, text_type)
492
495
 
493
496
        # ie.revision should either be None or a utf-8 revision id
494
497
        inv = s_v5.read_inventory_from_lines(breezy.osutils.split_lines(_inventory_utf8_v5))
510
513
        for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
511
514
             (act_path, act_ie)) in zip(expected, actual):
512
515
            self.assertEqual(exp_path, act_path)
513
 
            self.assertIsInstance(act_path, str)
 
516
            self.assertIsInstance(act_path, text_type)
514
517
            self.assertEqual(exp_file_id, act_ie.file_id)
515
518
            self.assertIsInstance(act_ie.file_id, bytes)
516
519
            self.assertEqual(exp_parent_id, act_ie.parent_id)