/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/blackbox/test_revert.py

Merge test-run support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_revert.py
66
66
 
67
67
        self.assertEqual('1\n', self.run_bzr('revno')[0])
68
68
        self.run_bzr('revert %s file' % param)
69
 
        with open('file', 'rb') as f:
70
 
            self.assertEqual(b'spam', f.read())
 
69
        self.assertEqual('spam', open('file', 'rb').read())
71
70
 
72
71
    def test_revert_in_subdir(self):
73
72
        self.helper()
119
118
    def test_revert(self):
120
119
        self.run_bzr('init')
121
120
 
122
 
        with open('hello', 'wt') as f:
123
 
            f.write('foo')
 
121
        with open('hello', 'wt') as f: f.write('foo')
124
122
        self.run_bzr('add hello')
125
123
        self.run_bzr('commit -m setup hello')
126
124
 
127
 
        with open('goodbye', 'wt') as f:
128
 
            f.write('baz')
 
125
        with open('goodbye', 'wt') as f: f.write('baz')
129
126
        self.run_bzr('add goodbye')
130
127
        self.run_bzr('commit -m setup goodbye')
131
128
 
132
 
        with open('hello', 'wt') as f:
133
 
            f.write('bar')
134
 
        with open('goodbye', 'wt') as f:
135
 
            f.write('qux')
 
129
        with open('hello', 'wt') as f: f.write('bar')
 
130
        with open('goodbye', 'wt') as f: f.write('qux')
136
131
        self.run_bzr('revert hello')
137
132
        self.check_file_contents('hello', b'foo')
138
133
        self.check_file_contents('goodbye', b'qux')
160
155
        else:
161
156
            self.log("skipping revert symlink tests")
162
157
 
163
 
        with open('hello', 'wt') as f:
164
 
            f.write('xyz')
 
158
        with open('hello', 'wt') as f: f.write('xyz')
165
159
        self.run_bzr('commit -m xyz hello')
166
160
        self.run_bzr('revert -r 1 hello')
167
161
        self.check_file_contents('hello', b'foo')
204
198
        self.build_tree_contents([('file', b'new content')])
205
199
        existing_parents = tree.get_parent_ids()
206
200
        self.assertEqual([first_rev_id], existing_parents)
207
 
        merged_parents = existing_parents + [b'merged-in-rev']
 
201
        merged_parents = existing_parents + ['merged-in-rev']
208
202
        tree.set_parent_ids(merged_parents)
209
203
        self.assertEqual(merged_parents, tree.get_parent_ids())
210
204
        self.run_bzr(['revert', '--forget-merges'])
211
205
        self.assertEqual([first_rev_id], tree.get_parent_ids())
212
206
        # changed files are not reverted
213
 
        self.assertFileEqual(b'new content', 'file')
 
207
        self.assertFileEqual('new content', 'file')
214
208
        # you can give it the path of a tree
215
209
        self.run_bzr(['revert', '--forget-merges', tree.abspath('.')])