/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_nested_specifics.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_nested_specifics.py
51
51
        tree.lock_write()
52
52
        self.addCleanup(tree.unlock)
53
53
        self.build_tree(['subtree/'])
54
 
        tree.add(['subtree'], ['subtree-id'])
55
 
        subtree = tree.extract('subtree-id')
 
54
        tree.add(['subtree'])
 
55
        subtree = tree.extract('subtree')
56
56
 
57
57
    def prepare_with_subtree(self):
58
58
        tree = self.make_branch_and_tree('.')
79
79
 
80
80
    def test_iter_entries_by_dir_autodetects_subtree(self):
81
81
        tree = self.prepare_with_subtree()
82
 
        path, ie = next(tree.iter_entries_by_dir(['subtree-id']))
 
82
        path, ie = next(tree.iter_entries_by_dir(specific_files=['subtree']))
83
83
        self.assertEqual('tree-reference', ie.kind)