/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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 01:15:15 UTC
  • mfrom: (6893 work)
  • mto: This revision was merged to the branch mainline in revision 6895.
  • Revision ID: jelmer@jelmer.uk-20180324011515-sssnq5bxtokiybap
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
168
168
        self.assertIs(self.wt.is_executable('name2'), False)
169
169
        self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
170
170
        self.assertEqual(len(modified_paths), 3)
171
 
        tree_mod_paths = [self.wt.id2abspath(f) for f in
 
171
        tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
172
172
                          ('ozzie', 'my_pretties', 'my_pretties2')]
173
173
        self.assertSubset(tree_mod_paths, modified_paths)
174
174
        # is it safe to finalize repeatedly?
1763
1763
        merge_modified = this.wt.merge_modified()
1764
1764
        self.assertSubset(merge_modified, modified)
1765
1765
        self.assertEqual(len(merge_modified), len(modified))
1766
 
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
 
1766
        with file(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write('booga')
1767
1767
        modified.pop(0)
1768
1768
        merge_modified = this.wt.merge_modified()
1769
1769
        self.assertSubset(merge_modified, modified)
2977
2977
                       tt.trans_id_file_id('moved-id'))
2978
2978
        self.assertMatchingIterEntries(tt)
2979
2979
 
2980
 
    def test_iter_entries_by_dir_specific_file_ids(self):
 
2980
    def test_iter_entries_by_dir_specific_files(self):
2981
2981
        tree = self.make_branch_and_tree('tree')
2982
2982
        tree.set_root_id('tree-root-id')
2983
2983
        self.build_tree(['tree/parent/', 'tree/parent/child'])