/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/test_transform.py

merge iter-entries-by-dir-specific-files

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
2937
2937
        self.assertFalse(preview_tree.is_versioned('old_name/child'))
2938
2938
        self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2939
2939
 
2940
 
    def assertMatchingIterEntries(self, tt, specific_file_ids=None):
 
2940
    def assertMatchingIterEntries(self, tt, specific_files=None):
2941
2941
        preview_tree = tt.get_preview_tree()
2942
2942
        preview_result = list(preview_tree.iter_entries_by_dir(
2943
 
                              specific_file_ids))
 
2943
                              specific_files=specific_files))
2944
2944
        tree = tt._tree
2945
2945
        tt.apply()
2946
 
        actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
 
2946
        actual_result = list(tree.iter_entries_by_dir(
 
2947
            specific_files=specific_files))
2947
2948
        self.assertEqual(actual_result, preview_result)
2948
2949
 
2949
2950
    def test_iter_entries_by_dir_new(self):
2977
2978
                       tt.trans_id_file_id('moved-id'))
2978
2979
        self.assertMatchingIterEntries(tt)
2979
2980
 
2980
 
    def test_iter_entries_by_dir_specific_file_ids(self):
 
2981
    def test_iter_entries_by_dir_specific_files(self):
2981
2982
        tree = self.make_branch_and_tree('tree')
2982
2983
        tree.set_root_id('tree-root-id')
2983
2984
        self.build_tree(['tree/parent/', 'tree/parent/child'])
2984
2985
        tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2985
2986
        tt = TreeTransform(tree)
2986
 
        self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
 
2987
        self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2987
2988
 
2988
2989
    def test_symlink_content_summary(self):
2989
2990
        self.requireFeature(SymlinkFeature)