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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revert.py
88
88
        tt.apply()
89
89
        tree.lock_write()
90
90
        try:
91
 
            self.assertTrue(tree.is_executable('newfile-id'))
 
91
            self.assertTrue(tree.is_executable('newfile'))
92
92
            tree.commit('added newfile')
93
93
        finally:
94
94
            tree.unlock()
104
104
        tree = workingtree.WorkingTree.open('tree')
105
105
        tree.lock_write()
106
106
        self.addCleanup(tree.unlock)
107
 
        self.assertTrue(tree.is_executable('newfile-id'))
 
107
        self.assertTrue(tree.is_executable('newfile'))
108
108
        transform.revert(tree, tree.basis_tree(), None, backups=True)
109
 
        self.assertEqual('helooo!', tree.get_file('newfile-id').read())
110
 
        self.assertTrue(tree.is_executable('newfile-id'))
 
109
        self.assertEqual('helooo!', tree.get_file('newfile').read())
 
110
        self.assertTrue(tree.is_executable('newfile'))
111
111
 
112
112
    def test_revert_executable(self):
113
113
        tree = self.tree_with_executable()
118
118
        tree.lock_write()
119
119
        self.addCleanup(tree.unlock)
120
120
        transform.revert(tree, tree.basis_tree(), None)
121
 
        self.assertTrue(tree.is_executable('newfile-id'))
 
121
        self.assertTrue(tree.is_executable('newfile'))
122
122
 
123
123
    def test_revert_deletes_files_from_revert(self):
124
124
        tree = self.make_branch_and_tree('.')