← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2012-03-20 02:40:57 UTC
  • Revision ID: aaron@aaronbentley.com-20120320024057-mqltf93xxs09r0ry
Compatibility fixes for bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
44
44
        self.tree.lock_read()
45
45
        try:
46
46
            old_date = _patch_header_date(old_tree,
47
 
                                          old_tree.inventory.path2id(filename),
 
47
                                          old_tree.path2id(filename),
48
48
                                          filename)
49
49
            new_date = _patch_header_date(self.tree,
50
 
                self.tree.inventory.path2id(filename), filename)
 
50
                self.tree.path2id(filename), filename)
51
51
        finally:
52
52
            self.tree.unlock()
53
53
            old_tree.unlock()
63
63
        old_tree.lock_read()
64
64
        try:
65
65
            old_date = _patch_header_date(old_tree,
66
 
                                          old_tree.inventory.path2id(filename),
 
66
                                          old_tree.path2id(filename),
67
67
                                          filename)
68
68
        finally:
69
69
            old_tree.unlock()
96
96
            self.tree.lock_write()
97
97
            try:
98
98
                new_date = _patch_header_date(self.tree,
99
 
                    self.tree.inventory.path2id('test_file'), 'test_file')
 
99
                    self.tree.path2id('test_file'), 'test_file')
100
100
            finally:
101
101
                self.tree.unlock()
102
102
 
337
337
            f.write(self.MODIFIED)
338
338
            f.close()
339
339
            new_date = _patch_header_date(self.tree,
340
 
                self.tree.inventory.path2id('test_file'), 'test_file')
 
340
                self.tree.path2id('test_file'), 'test_file')
341
341
        finally:
342
342
            self.tree.unlock()
343
343
 
438
438
        self.tree.lock_read()
439
439
        try:
440
440
            old_date = _patch_header_date(old_tree,
441
 
                old_tree.inventory.path2id('test_file'),
 
441
                old_tree.path2id('test_file'),
442
442
                                          'test_file')
443
443
            new_date = _patch_header_date(self.tree,
444
 
                self.tree.inventory.path2id('test_file'), 'test_file')
 
444
                self.tree.path2id('test_file'), 'test_file')
445
445
        finally:
446
446
            old_tree.unlock()
447
447
            self.tree.unlock()