/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-03-24 10:24:48 UTC
  • mfrom: (6910 work)
  • mto: This revision was merged to the branch mainline in revision 6913.
  • Revision ID: jelmer@jelmer.uk-20180324102448-132p8l8t5ogdzhhu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_test_trees.py
228
228
                        (u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',
229
229
                         baz_id, bar_id, revision_id),
230
230
                       ]
231
 
        tree.lock_read()
232
 
        try:
 
231
        with tree.lock_read():
233
232
            path_entries = list(tree.iter_entries_by_dir())
234
 
        finally:
235
 
            tree.unlock()
236
233
 
237
234
        for expected, (path, ie) in zip(path_and_ids, path_entries):
238
235
            self.assertEqual(expected[0], path) # Paths should match
276
273
                        (u'ba\N{Euro Sign}r/qu\N{Euro Sign}x',
277
274
                         qux_id, bar_id, revision_id_2),
278
275
                       ]
279
 
        tree.lock_read()
280
 
        try:
 
276
        with tree.lock_read():
281
277
            path_entries = list(tree.iter_entries_by_dir())
282
 
        finally:
283
 
            tree.unlock()
284
278
 
285
279
        for (epath, efid, eparent, erev), (path, ie) in zip(path_and_ids,
286
280
                                                            path_entries):