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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-15 13:10:28 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 6993.
  • Revision ID: jelmer@jelmer.uk-20180615131028-abolpmqrid8th0cd
More bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
175
175
        file_without_path = tree.get_file('a')
176
176
        try:
177
177
            lines = file_without_path.readlines()
178
 
            self.assertEqual(['foobar\n'], lines)
 
178
            self.assertEqual([b'foobar\n'], lines)
179
179
        finally:
180
180
            file_without_path.close()
181
181
        # Test lookup with path works
182
182
        file_with_path = tree.get_file('a', a_id)
183
183
        try:
184
184
            lines = file_with_path.readlines()
185
 
            self.assertEqual(['foobar\n'], lines)
 
185
            self.assertEqual([b'foobar\n'], lines)
186
186
        finally:
187
187
            file_with_path.close()
188
188
 
193
193
        tree.lock_read()
194
194
        self.addCleanup(tree.unlock)
195
195
        with tree.get_file('a') as f:
196
 
            self.assertEqual('foobar\n', f.read())
 
196
            self.assertEqual(b'foobar\n', f.read())
197
197
 
198
198
    def test_get_file_text(self):
199
199
        work_tree = self.make_branch_and_tree('wt')
224
224
        tree = self._convert_tree(work_tree)
225
225
        tree.lock_read()
226
226
        self.addCleanup(tree.unlock)
227
 
        self.assertEqual(['a\rb\n', 'c\r\n', 'd'],
 
227
        self.assertEqual([b'a\rb\n', b'c\r\n', b'd'],
228
228
                         tree.get_file_lines('foobar'))
229
229
 
230
230
 
239
239
        tree = self._convert_tree(work_tree)
240
240
        tree.lock_read()
241
241
        self.addCleanup(tree.unlock)
242
 
        extracted = dict((i, ''.join(b)) for i, b in
 
242
        extracted = dict((i, b''.join(b)) for i, b in
243
243
                         tree.iter_files_bytes([('foo', 'id1'),
244
244
                                                ('bar', 'id2'),
245
245
                                                ('baz', 'id3')]))
246
 
        self.assertEqual('foo', extracted['id1'])
247
 
        self.assertEqual('bar', extracted['id2'])
248
 
        self.assertEqual('baz', extracted['id3'])
 
246
        self.assertEqual(b'foo', extracted['id1'])
 
247
        self.assertEqual(b'bar', extracted['id2'])
 
248
        self.assertEqual(b'baz', extracted['id3'])
249
249
        self.assertRaises(errors.NoSuchFile, lambda: list(
250
250
                          tree.iter_files_bytes(
251
251
                          [('qux', 'file1-notpresent')])))
338
338
        tree = self._convert_tree(work_tree)
339
339
        tree.lock_read()
340
340
        self.addCleanup(tree.unlock)
341
 
        expected = osutils.sha_strings('file content')
 
341
        expected = osutils.sha_strings(b'file content')
342
342
        self.assertEqual(expected, tree.get_file_sha1('file'))
343
343
 
344
344
 
358
358
            tree.get_file_verifier('file1'),
359
359
            tree.get_file_verifier('file2'))
360
360
        if kind == "SHA1":
361
 
            expected = osutils.sha_strings('file content')
 
361
            expected = osutils.sha_strings(b'file content')
362
362
            self.assertEqual(expected, data)
363
363
 
364
364