/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 bzrlib/tests/test_shelf_ui.py

  • Committer: Robert Collins
  • Date: 2009-08-19 01:44:41 UTC
  • mto: This revision was merged to the branch mainline in revision 4628.
  • Revision ID: robertc@robertcollins.net-20090819014441-7m54nhv96hn1eatu
Review feedback per IanC.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
 
1
# Copyright (C) 2008 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from cStringIO import StringIO
 
19
import os
 
20
import sys
 
21
 
 
22
from bzrlib import errors, shelf_ui, tests
 
23
 
 
24
 
 
25
class ExpectShelver(shelf_ui.Shelver):
 
26
    """A variant of Shelver that intercepts console activity, for testing."""
 
27
 
 
28
    def __init__(self, work_tree, target_tree, diff_writer=None,
 
29
                 auto=False, auto_apply=False, file_list=None, message=None,
 
30
                 destroy=False, reporter=None):
 
31
        shelf_ui.Shelver.__init__(self, work_tree, target_tree, diff_writer,
 
32
                                  auto, auto_apply, file_list, message,
 
33
                                  destroy, reporter=reporter)
 
34
        self.expected = []
 
35
        self.diff_writer = StringIO()
 
36
 
 
37
    def expect(self, prompt, response):
 
38
        self.expected.append((prompt, response))
 
39
 
 
40
    def prompt(self, message):
 
41
        try:
 
42
            prompt, response = self.expected.pop(0)
 
43
        except IndexError:
 
44
            raise AssertionError('Unexpected prompt: %s' % message)
 
45
        if prompt != message:
 
46
            raise AssertionError('Wrong prompt: %s' % message)
 
47
        return response
 
48
 
 
49
 
 
50
LINES_AJ = 'a\nb\nc\nd\ne\nf\ng\nh\ni\nj\n'
 
51
 
 
52
 
 
53
LINES_ZY = 'z\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
 
54
 
 
55
 
 
56
LINES_AY = 'a\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
 
57
 
 
58
 
 
59
class TestShelver(tests.TestCaseWithTransport):
 
60
 
 
61
    def create_shelvable_tree(self):
 
62
        tree = self.make_branch_and_tree('tree')
 
63
        self.build_tree_contents([('tree/foo', LINES_AJ)])
 
64
        tree.add('foo', 'foo-id')
 
65
        tree.commit('added foo')
 
66
        self.build_tree_contents([('tree/foo', LINES_ZY)])
 
67
        return tree
 
68
 
 
69
    def test_unexpected_prompt_failure(self):
 
70
        self.thisFailsStrictLockCheck()
 
71
        tree = self.create_shelvable_tree()
 
72
        shelver = ExpectShelver(tree, tree.basis_tree())
 
73
        e = self.assertRaises(AssertionError, shelver.run)
 
74
        self.assertEqual('Unexpected prompt: Shelve? [yNfq?]', str(e))
 
75
 
 
76
    def test_wrong_prompt_failure(self):
 
77
        self.thisFailsStrictLockCheck()
 
78
        tree = self.create_shelvable_tree()
 
79
        shelver = ExpectShelver(tree, tree.basis_tree())
 
80
        shelver.expect('foo', 'y')
 
81
        e = self.assertRaises(AssertionError, shelver.run)
 
82
        self.assertEqual('Wrong prompt: Shelve? [yNfq?]', str(e))
 
83
 
 
84
    def test_shelve_not_diff(self):
 
85
        self.thisFailsStrictLockCheck()
 
86
        tree = self.create_shelvable_tree()
 
87
        shelver = ExpectShelver(tree, tree.basis_tree())
 
88
        shelver.expect('Shelve? [yNfq?]', 'n')
 
89
        shelver.expect('Shelve? [yNfq?]', 'n')
 
90
        # No final shelving prompt because no changes were selected
 
91
        shelver.run()
 
92
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
93
 
 
94
    def test_shelve_diff_no(self):
 
95
        self.thisFailsStrictLockCheck()
 
96
        tree = self.create_shelvable_tree()
 
97
        shelver = ExpectShelver(tree, tree.basis_tree())
 
98
        shelver.expect('Shelve? [yNfq?]', 'y')
 
99
        shelver.expect('Shelve? [yNfq?]', 'y')
 
100
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'n')
 
101
        shelver.run()
 
102
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
103
 
 
104
    def test_shelve_diff(self):
 
105
        self.thisFailsStrictLockCheck()
 
106
        tree = self.create_shelvable_tree()
 
107
        shelver = ExpectShelver(tree, tree.basis_tree())
 
108
        shelver.expect('Shelve? [yNfq?]', 'y')
 
109
        shelver.expect('Shelve? [yNfq?]', 'y')
 
110
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
 
111
        shelver.run()
 
112
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
113
 
 
114
    def test_shelve_one_diff(self):
 
115
        self.thisFailsStrictLockCheck()
 
116
        tree = self.create_shelvable_tree()
 
117
        shelver = ExpectShelver(tree, tree.basis_tree())
 
118
        shelver.expect('Shelve? [yNfq?]', 'y')
 
119
        shelver.expect('Shelve? [yNfq?]', 'n')
 
120
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
121
        shelver.run()
 
122
        self.assertFileEqual(LINES_AY, 'tree/foo')
 
123
 
 
124
    def test_shelve_binary_change(self):
 
125
        self.thisFailsStrictLockCheck()
 
126
        tree = self.create_shelvable_tree()
 
127
        self.build_tree_contents([('tree/foo', '\x00')])
 
128
        shelver = ExpectShelver(tree, tree.basis_tree())
 
129
        shelver.expect('Shelve binary changes? [yNfq?]', 'y')
 
130
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
131
        shelver.run()
 
132
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
133
 
 
134
    def test_shelve_rename(self):
 
135
        self.thisFailsStrictLockCheck()
 
136
        tree = self.create_shelvable_tree()
 
137
        tree.rename_one('foo', 'bar')
 
138
        shelver = ExpectShelver(tree, tree.basis_tree())
 
139
        shelver.expect('Shelve renaming "foo" => "bar"? [yNfq?]', 'y')
 
140
        shelver.expect('Shelve? [yNfq?]', 'y')
 
141
        shelver.expect('Shelve? [yNfq?]', 'y')
 
142
        shelver.expect('Shelve 3 change(s)? [yNfq?]', 'y')
 
143
        shelver.run()
 
144
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
145
 
 
146
    def test_shelve_deletion(self):
 
147
        self.thisFailsStrictLockCheck()
 
148
        tree = self.create_shelvable_tree()
 
149
        os.unlink('tree/foo')
 
150
        shelver = ExpectShelver(tree, tree.basis_tree())
 
151
        shelver.expect('Shelve removing file "foo"? [yNfq?]', 'y')
 
152
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
153
        shelver.run()
 
154
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
155
 
 
156
    def test_shelve_creation(self):
 
157
        self.thisFailsStrictLockCheck()
 
158
        tree = self.make_branch_and_tree('tree')
 
159
        tree.commit('add tree root')
 
160
        self.build_tree(['tree/foo'])
 
161
        tree.add('foo')
 
162
        shelver = ExpectShelver(tree, tree.basis_tree())
 
163
        shelver.expect('Shelve adding file "foo"? [yNfq?]', 'y')
 
164
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
165
        shelver.run()
 
166
        self.failIfExists('tree/foo')
 
167
 
 
168
    def test_shelve_kind_change(self):
 
169
        self.thisFailsStrictLockCheck()
 
170
        tree = self.create_shelvable_tree()
 
171
        os.unlink('tree/foo')
 
172
        os.mkdir('tree/foo')
 
173
        shelver = ExpectShelver(tree, tree.basis_tree())
 
174
        shelver.expect('Shelve changing "foo" from file to directory? [yNfq?]',
 
175
                       'y')
 
176
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
177
 
 
178
    def test_shelve_modify_target(self):
 
179
        self.thisFailsStrictLockCheck()
 
180
        self.requireFeature(tests.SymlinkFeature)
 
181
        tree = self.create_shelvable_tree()
 
182
        os.symlink('bar', 'tree/baz')
 
183
        tree.add('baz', 'baz-id')
 
184
        tree.commit("Add symlink")
 
185
        os.unlink('tree/baz')
 
186
        os.symlink('vax', 'tree/baz')
 
187
        shelver = ExpectShelver(tree, tree.basis_tree())
 
188
        shelver.expect('Shelve changing target of "baz" from "bar" to '
 
189
                '"vax"? [yNfq?]', 'y')
 
190
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
191
        shelver.run()
 
192
        self.assertEqual('bar', os.readlink('tree/baz'))
 
193
 
 
194
    def test_shelve_finish(self):
 
195
        self.thisFailsStrictLockCheck()
 
196
        tree = self.create_shelvable_tree()
 
197
        shelver = ExpectShelver(tree, tree.basis_tree())
 
198
        shelver.expect('Shelve? [yNfq?]', 'f')
 
199
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
 
200
        shelver.run()
 
201
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
202
 
 
203
    def test_shelve_quit(self):
 
204
        self.thisFailsStrictLockCheck()
 
205
        tree = self.create_shelvable_tree()
 
206
        shelver = ExpectShelver(tree, tree.basis_tree())
 
207
        shelver.expect('Shelve? [yNfq?]', 'q')
 
208
        self.assertRaises(errors.UserAbort, shelver.run)
 
209
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
210
 
 
211
    def test_shelve_all(self):
 
212
        self.thisFailsStrictLockCheck()
 
213
        tree = self.create_shelvable_tree()
 
214
        ExpectShelver.from_args(sys.stdout, all=True, directory='tree').run()
 
215
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
216
 
 
217
    def test_shelve_filename(self):
 
218
        self.thisFailsStrictLockCheck()
 
219
        tree = self.create_shelvable_tree()
 
220
        self.build_tree(['tree/bar'])
 
221
        tree.add('bar')
 
222
        shelver = ExpectShelver(tree, tree.basis_tree(), file_list=['bar'])
 
223
        shelver.expect('Shelve adding file "bar"? [yNfq?]', 'y')
 
224
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
225
        shelver.run()
 
226
 
 
227
    def test_shelve_help(self):
 
228
        self.thisFailsStrictLockCheck()
 
229
        tree = self.create_shelvable_tree()
 
230
        shelver = ExpectShelver(tree, tree.basis_tree())
 
231
        shelver.expect('Shelve? [yNfq?]', '?')
 
232
        shelver.expect('Shelve? [(y)es, (N)o, (f)inish, or (q)uit]', 'f')
 
233
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
 
234
        shelver.run()
 
235
 
 
236
    def test_shelve_distroy(self):
 
237
        self.thisFailsStrictLockCheck()
 
238
        tree = self.create_shelvable_tree()
 
239
        shelver = shelf_ui.Shelver.from_args(sys.stdout, all=True,
 
240
                                             directory='tree', destroy=True)
 
241
        shelver.run()
 
242
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
 
243
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
244
 
 
245
 
 
246
class TestApplyReporter(TestShelver):
 
247
 
 
248
    def test_shelve_not_diff(self):
 
249
        self.thisFailsStrictLockCheck()
 
250
        tree = self.create_shelvable_tree()
 
251
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
252
                                reporter=shelf_ui.ApplyReporter())
 
253
        shelver.expect('Apply change? [yNfq?]', 'n')
 
254
        shelver.expect('Apply change? [yNfq?]', 'n')
 
255
        # No final shelving prompt because no changes were selected
 
256
        shelver.run()
 
257
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
258
 
 
259
    def test_shelve_diff_no(self):
 
260
        self.thisFailsStrictLockCheck()
 
261
        tree = self.create_shelvable_tree()
 
262
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
263
                                reporter=shelf_ui.ApplyReporter())
 
264
        shelver.expect('Apply change? [yNfq?]', 'y')
 
265
        shelver.expect('Apply change? [yNfq?]', 'y')
 
266
        shelver.expect('Apply 2 change(s)? [yNfq?]', 'n')
 
267
        shelver.run()
 
268
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
269
 
 
270
    def test_shelve_diff(self):
 
271
        self.thisFailsStrictLockCheck()
 
272
        tree = self.create_shelvable_tree()
 
273
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
274
                                reporter=shelf_ui.ApplyReporter())
 
275
        shelver.expect('Apply change? [yNfq?]', 'y')
 
276
        shelver.expect('Apply change? [yNfq?]', 'y')
 
277
        shelver.expect('Apply 2 change(s)? [yNfq?]', 'y')
 
278
        shelver.run()
 
279
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
280
 
 
281
    def test_shelve_binary_change(self):
 
282
        self.thisFailsStrictLockCheck()
 
283
        tree = self.create_shelvable_tree()
 
284
        self.build_tree_contents([('tree/foo', '\x00')])
 
285
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
286
                                reporter=shelf_ui.ApplyReporter())
 
287
        shelver.expect('Apply binary changes? [yNfq?]', 'y')
 
288
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
 
289
        shelver.run()
 
290
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
291
 
 
292
    def test_shelve_rename(self):
 
293
        self.thisFailsStrictLockCheck()
 
294
        tree = self.create_shelvable_tree()
 
295
        tree.rename_one('foo', 'bar')
 
296
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
297
                                reporter=shelf_ui.ApplyReporter())
 
298
        shelver.expect('Rename "bar" => "foo"? [yNfq?]', 'y')
 
299
        shelver.expect('Apply change? [yNfq?]', 'y')
 
300
        shelver.expect('Apply change? [yNfq?]', 'y')
 
301
        shelver.expect('Apply 3 change(s)? [yNfq?]', 'y')
 
302
        shelver.run()
 
303
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
304
 
 
305
    def test_shelve_deletion(self):
 
306
        self.thisFailsStrictLockCheck()
 
307
        tree = self.create_shelvable_tree()
 
308
        os.unlink('tree/foo')
 
309
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
310
                                reporter=shelf_ui.ApplyReporter())
 
311
        shelver.expect('Add file "foo"? [yNfq?]', 'y')
 
312
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
 
313
        shelver.run()
 
314
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
315
 
 
316
    def test_shelve_creation(self):
 
317
        self.thisFailsStrictLockCheck()
 
318
        tree = self.make_branch_and_tree('tree')
 
319
        tree.commit('add tree root')
 
320
        self.build_tree(['tree/foo'])
 
321
        tree.add('foo')
 
322
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
323
                                reporter=shelf_ui.ApplyReporter())
 
324
        shelver.expect('Delete file "foo"? [yNfq?]', 'y')
 
325
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
 
326
        shelver.run()
 
327
        self.failIfExists('tree/foo')
 
328
 
 
329
    def test_shelve_kind_change(self):
 
330
        self.thisFailsStrictLockCheck()
 
331
        tree = self.create_shelvable_tree()
 
332
        os.unlink('tree/foo')
 
333
        os.mkdir('tree/foo')
 
334
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
335
                               reporter=shelf_ui.ApplyReporter())
 
336
        shelver.expect('Change "foo" from directory to a file? [yNfq?]', 'y')
 
337
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
 
338
 
 
339
    def test_shelve_modify_target(self):
 
340
        self.thisFailsStrictLockCheck()
 
341
        self.requireFeature(tests.SymlinkFeature)
 
342
        tree = self.create_shelvable_tree()
 
343
        os.symlink('bar', 'tree/baz')
 
344
        tree.add('baz', 'baz-id')
 
345
        tree.commit("Add symlink")
 
346
        os.unlink('tree/baz')
 
347
        os.symlink('vax', 'tree/baz')
 
348
        shelver = ExpectShelver(tree, tree.basis_tree(),
 
349
                                reporter=shelf_ui.ApplyReporter())
 
350
        shelver.expect('Change target of "baz" from "vax" to "bar"? [yNfq?]',
 
351
                       'y')
 
352
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
 
353
        shelver.run()
 
354
        self.assertEqual('bar', os.readlink('tree/baz'))
 
355
 
 
356
 
 
357
class TestUnshelver(tests.TestCaseWithTransport):
 
358
 
 
359
    def create_tree_with_shelf(self):
 
360
        tree = self.make_branch_and_tree('tree')
 
361
        self.build_tree_contents([('tree/foo', LINES_AJ)])
 
362
        tree.add('foo', 'foo-id')
 
363
        tree.commit('added foo')
 
364
        self.build_tree_contents([('tree/foo', LINES_ZY)])
 
365
        shelf_ui.Shelver(tree, tree.basis_tree(), auto_apply=True,
 
366
                         auto=True).run()
 
367
        return tree
 
368
 
 
369
    def test_unshelve(self):
 
370
        self.thisFailsStrictLockCheck()
 
371
        tree = self.create_tree_with_shelf()
 
372
        tree.lock_write()
 
373
        self.addCleanup(tree.unlock)
 
374
        manager = tree.get_shelf_manager()
 
375
        shelf_ui.Unshelver(tree, manager, 1, True, True, True).run()
 
376
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
377
 
 
378
    def test_unshelve_args(self):
 
379
        self.thisFailsStrictLockCheck()
 
380
        tree = self.create_tree_with_shelf()
 
381
        shelf_ui.Unshelver.from_args(directory='tree').run()
 
382
        self.assertFileEqual(LINES_ZY, 'tree/foo')
 
383
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
 
384
 
 
385
    def test_unshelve_args_dry_run(self):
 
386
        self.thisFailsStrictLockCheck()
 
387
        tree = self.create_tree_with_shelf()
 
388
        shelf_ui.Unshelver.from_args(directory='tree', action='dry-run').run()
 
389
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
390
        self.assertEqual(1, tree.get_shelf_manager().last_shelf())
 
391
 
 
392
    def test_unshelve_args_delete_only(self):
 
393
        self.thisFailsStrictLockCheck()
 
394
        tree = self.make_branch_and_tree('tree')
 
395
        manager = tree.get_shelf_manager()
 
396
        shelf_file = manager.new_shelf()[1]
 
397
        try:
 
398
            shelf_file.write('garbage')
 
399
        finally:
 
400
            shelf_file.close()
 
401
        unshelver = shelf_ui.Unshelver.from_args(directory='tree',
 
402
                                                 action='delete-only')
 
403
        unshelver.run()
 
404
        self.assertIs(None, manager.last_shelf())
 
405
 
 
406
    def test_unshelve_args_invalid_shelf_id(self):
 
407
        self.thisFailsStrictLockCheck()
 
408
        tree = self.make_branch_and_tree('tree')
 
409
        manager = tree.get_shelf_manager()
 
410
        shelf_file = manager.new_shelf()[1]
 
411
        try:
 
412
            shelf_file.write('garbage')
 
413
        finally:
 
414
            shelf_file.close()
 
415
        self.assertRaises(errors.InvalidShelfId,
 
416
            shelf_ui.Unshelver.from_args, directory='tree',
 
417
            action='delete-only', shelf_id='foo')