/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 bzrlib/tests/test_conflicts.py

Find callers of list_files() and make sure the tree is always locked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
58
58
        file('hello.OTHER', 'w').write('hello world3')
59
59
        file('hello.sploo.BASE', 'w').write('yellow world')
60
60
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
61
        tree.lock_read()
61
62
        self.assertEqual(len(list(tree.list_files())), 6)
 
63
        tree.unlock()
62
64
        conflicts = tree.conflicts()
63
65
        self.assertEqual(len(conflicts), 2)
64
66
        self.assert_('hello' in conflicts[0].path)