/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-24 00:53:02 UTC
  • mfrom: (6883.7.16 cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20180324005302-z0eh8ftsz57804cg
Avoid using file ids in a couple more places.

Merged from https://code.launchpad.net/~jelmer/brz/cleanups/+merge/341360

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)