/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_workingtree/test_inv.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_inv.py
68
68
        wt.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
69
69
        wt.apply_inventory_delta([('foo', None, 'foo-id', None),
70
70
                                  ('foo/bar', None, 'bar-id', None)])
71
 
        self.assertIs(None, wt.path2id('foo'))
 
71
        self.assertFalse(wt.is_versioned('foo'))
72
72
 
73
73
    def test_rename_dir_with_children(self):
74
74
        wt = self.make_branch_and_tree('.')
178
178
        # wt.current_dirstate()'s idea about what files are where.
179
179
        ie = base.inventory['subdir-id']
180
180
        self.assertEqual('directory', ie.kind)
181
 
        path, ie = next(base.iter_entries_by_dir(['subdir-id']))
 
181
        path, ie = next(base.iter_entries_by_dir(specific_files=['subdir']))
182
182
        self.assertEqual('subdir', path)
183
183
        self.assertEqual('tree-reference', ie.kind)