/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: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

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
21
20
from breezy.tests import per_tree
22
21
from breezy.tests import (
23
22
    TestNotApplicable,
323
322
 
324
323
        for expected, (path, ie) in zip(path_and_ids, path_entries):
325
324
            self.assertEqual(expected[0], path)  # Paths should match
326
 
            self.assertIsInstance(path, text_type)
 
325
            self.assertIsInstance(path, str)
327
326
            self.assertEqual(expected[1], ie.file_id)
328
327
            self.assertIsInstance(ie.file_id, bytes)
329
328
            self.assertEqual(expected[2], ie.parent_id)
393
392
        for (epath, efid, eparent, erev), (path, ie) in zip(path_and_ids,
394
393
                                                            path_entries):
395
394
            self.assertEqual(epath, path)  # Paths should match
396
 
            self.assertIsInstance(path, text_type)
 
395
            self.assertIsInstance(path, str)
397
396
            self.assertIsInstance(ie.file_id, bytes)
398
397
            if wt.supports_setting_file_ids():
399
398
                self.assertEqual(efid, ie.file_id)