/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/per_tree/test_test_trees.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 23:59:28 UTC
  • mfrom: (6973.6.4 python3-e)
  • Revision ID: jelmer@jelmer.uk-20180621235928-f7z0vf0lxc6ieo9e
Merge lp:~jelmer/brz/python3-e

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_test_trees.py
17
17
"""Tests for the test trees used by the per_tree tests."""
18
18
 
19
19
from breezy import errors
 
20
from breezy.sixish import text_type
20
21
from breezy.tests import per_tree
21
22
from breezy.tests import (
22
23
    TestNotApplicable,
318
319
 
319
320
        for expected, (path, ie) in zip(path_and_ids, path_entries):
320
321
            self.assertEqual(expected[0], path) # Paths should match
321
 
            self.assertIsInstance(path, unicode)
 
322
            self.assertIsInstance(path, text_type)
322
323
            self.assertEqual(expected[1], ie.file_id)
323
324
            self.assertIsInstance(ie.file_id, str)
324
325
            self.assertEqual(expected[2], ie.parent_id)
387
388
        for (epath, efid, eparent, erev), (path, ie) in zip(path_and_ids,
388
389
                                                            path_entries):
389
390
            self.assertEqual(epath, path) # Paths should match
390
 
            self.assertIsInstance(path, unicode)
 
391
            self.assertIsInstance(path, text_type)
391
392
            self.assertIsInstance(ie.file_id, bytes)
392
393
            if wt.supports_setting_file_ids():
393
394
                self.assertEqual(efid, ie.file_id)