/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/tree_implementations/test_tree.py

  • Committer: Andrew Bennetts
  • Date: 2008-07-28 06:53:44 UTC
  • mfrom: (3581 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3583.
  • Revision ID: andrew.bennetts@canonical.com-20080728065344-ocndjoycs903q6fz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
56
56
        tree_b.lock_read()
57
57
        self.addCleanup(tree_b.unlock)
58
58
        self.assertEqual([
 
59
            ('killed-a', 'a\n'),
59
60
            ('killed-b', 'b\n'),
60
 
            ('killed-a', 'a\n'),
61
61
            ('unchanged', 'c\n'),
62
62
            ('unchanged', 'd\n'),
63
63
            ('new-a', 'e\n'),
191
191
        work_tree = self.make_branch_and_tree('wt')
192
192
        tree = self._convert_tree(work_tree)
193
193
        self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
 
194
 
 
195
 
 
196
class TestIterEntriesByDir(TestCaseWithTree):
 
197
 
 
198
    def test_iteration_order(self):
 
199
        work_tree = self.make_branch_and_tree('.')
 
200
        self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
 
201
        work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
 
202
        tree = self._convert_tree(work_tree)
 
203
        output_order = [p for p, e in tree.iter_entries_by_dir()]
 
204
        self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
 
205
                         output_order)