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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-02 01:11:40 UTC
  • mfrom: (7023 work)
  • mto: This revision was merged to the branch mainline in revision 7025.
  • Revision ID: jelmer@jelmer.uk-20180702011140-toroicnrq9a5jstj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_dirstate.py
1723
1723
        expected_result.append(dirblocks[3][1][3]) # i
1724
1724
        expected_result.append(dirblocks[3][1][4]) # j
1725
1725
        self.assertEqual(expected_result,
1726
 
            list(state._iter_child_entries(1, 'b')))
 
1726
            list(state._iter_child_entries(1, b'b')))
1727
1727
 
1728
1728
    def test_iter_child_root(self):
1729
1729
        state, dirblocks = self.create_dirstate_with_two_trees()
1738
1738
        expected_result.append(dirblocks[3][1][3]) # i
1739
1739
        expected_result.append(dirblocks[3][1][4]) # j
1740
1740
        self.assertEqual(expected_result,
1741
 
            list(state._iter_child_entries(1, '')))
 
1741
            list(state._iter_child_entries(1, b'')))
1742
1742
 
1743
1743
 
1744
1744
class TestDirstateSortOrder(tests.TestCaseWithTransport):