1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
|
# Copyright (C) 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from cStringIO import StringIO
import os
import sys
from bzrlib import errors, shelf_ui, tests
class ExpectShelver(shelf_ui.Shelver):
"""A variant of Shelver that intercepts console activity, for testing."""
def __init__(self, work_tree, target_tree, diff_writer=None, path=None,
auto=False, auto_apply=False, file_list=None, message=None):
shelf_ui.Shelver.__init__(self, work_tree, target_tree, diff_writer,
auto, auto_apply, file_list, message)
self.expected = []
self.diff_writer = StringIO()
def expect(self, prompt, response):
self.expected.append((prompt, response))
def prompt(self, message):
try:
prompt, response = self.expected.pop(0)
except IndexError:
raise AssertionError('Unexpected prompt: %s' % message)
if prompt != message:
raise AssertionError('Wrong prompt: %s' % message)
return response
LINES_AJ = 'a\nb\nc\nd\ne\nf\ng\nh\ni\nj\n'
LINES_ZY = 'z\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
LINES_AY = 'a\nb\nc\nd\ne\nf\ng\nh\ni\ny\n'
class TestShelver(tests.TestCaseWithTransport):
def create_shelvable_tree(self):
tree = self.make_branch_and_tree('tree')
self.build_tree_contents([('tree/foo', LINES_AJ)])
tree.add('foo', 'foo-id')
tree.commit('added foo')
self.build_tree_contents([('tree/foo', LINES_ZY)])
return tree
def test_unexpected_prompt_failure(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
e = self.assertRaises(AssertionError, shelver.run)
self.assertEqual('Unexpected prompt: Shelve? [yNfq?]', str(e))
def test_wrong_prompt_failure(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('foo', 'y')
e = self.assertRaises(AssertionError, shelver.run)
self.assertEqual('Wrong prompt: Shelve? [yNfq?]', str(e))
def test_shelve_not_diff(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', 'n')
shelver.expect('Shelve? [yNfq?]', 'n')
# No final shelving prompt because no changes were selected
shelver.run()
self.assertFileEqual(LINES_ZY, 'tree/foo')
def test_shelve_diff_no(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve 2 change(s)? [yNfq?]', 'n')
shelver.run()
self.assertFileEqual(LINES_ZY, 'tree/foo')
def test_shelve_diff(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
shelver.run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
def test_shelve_one_diff(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve? [yNfq?]', 'n')
shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
shelver.run()
self.assertFileEqual(LINES_AY, 'tree/foo')
def test_shelve_binary_change(self):
tree = self.create_shelvable_tree()
self.build_tree_contents([('tree/foo', '\x00')])
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve binary changes? [yNfq?]', 'y')
shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
shelver.run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
def test_shelve_rename(self):
tree = self.create_shelvable_tree()
tree.rename_one('foo', 'bar')
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve renaming "foo" => "bar"? [yNfq?]', 'y')
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve? [yNfq?]', 'y')
shelver.expect('Shelve 3 change(s)? [yNfq?]', 'y')
shelver.run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
def test_shelve_deletion(self):
tree = self.create_shelvable_tree()
os.unlink('tree/foo')
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve removing file "foo"? [yNfq?]', 'y')
shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
shelver.run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
def test_shelve_creation(self):
tree = self.make_branch_and_tree('tree')
tree.commit('add tree root')
self.build_tree(['tree/foo'])
tree.add('foo')
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve adding file "foo"? [yNfq?]', 'y')
shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
shelver.run()
self.failIfExists('tree/foo')
def test_shelve_kind_change(self):
tree = self.create_shelvable_tree()
os.unlink('tree/foo')
os.mkdir('tree/foo')
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve changing "foo" from file to directory? [yNfq?]',
'y')
shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
def test_shelve_finish(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', 'f')
shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
shelver.run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
def test_shelve_quit(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', 'q')
self.assertRaises(errors.UserAbort, shelver.run)
self.assertFileEqual(LINES_ZY, 'tree/foo')
def test_shelve_all(self):
tree = self.create_shelvable_tree()
ExpectShelver.from_args(sys.stdout, all=True, directory='tree').run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
def test_shelve_filename(self):
tree = self.create_shelvable_tree()
self.build_tree(['tree/bar'])
tree.add('bar')
shelver = ExpectShelver(tree, tree.basis_tree(), file_list=['bar'])
shelver.expect('Shelve adding file "bar"? [yNfq?]', 'y')
shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
shelver.run()
def test_shelve_help(self):
tree = self.create_shelvable_tree()
shelver = ExpectShelver(tree, tree.basis_tree())
shelver.expect('Shelve? [yNfq?]', '?')
shelver.expect('Shelve? [(y)es, (N)o, (f)inish, or (q)uit]', 'f')
shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
shelver.run()
class TestUnshelver(tests.TestCaseWithTransport):
def create_tree_with_shelf(self):
tree = self.make_branch_and_tree('tree')
self.build_tree_contents([('tree/foo', LINES_AJ)])
tree.add('foo', 'foo-id')
tree.commit('added foo')
self.build_tree_contents([('tree/foo', LINES_ZY)])
shelf_ui.Shelver(tree, tree.basis_tree(), auto_apply=True,
auto=True).run()
return tree
def test_unshelve(self):
tree = self.create_tree_with_shelf()
tree.lock_write()
self.addCleanup(tree.unlock)
manager = tree.get_shelf_manager()
shelf_ui.Unshelver(tree, manager, 1, True, True, True).run()
self.assertFileEqual(LINES_ZY, 'tree/foo')
def test_unshelve_args(self):
tree = self.create_tree_with_shelf()
shelf_ui.Unshelver.from_args(directory='tree').run()
self.assertFileEqual(LINES_ZY, 'tree/foo')
self.assertIs(None, tree.get_shelf_manager().last_shelf())
def test_unshelve_args_dry_run(self):
tree = self.create_tree_with_shelf()
shelf_ui.Unshelver.from_args(directory='tree', action='dry-run').run()
self.assertFileEqual(LINES_AJ, 'tree/foo')
self.assertEqual(1, tree.get_shelf_manager().last_shelf())
def test_unshelve_args_delete_only(self):
tree = self.make_branch_and_tree('tree')
manager = tree.get_shelf_manager()
shelf_file = manager.new_shelf()[1]
try:
shelf_file.write('garbage')
finally:
shelf_file.close()
unshelver = shelf_ui.Unshelver.from_args(directory='tree',
action='delete-only')
unshelver.run()
self.assertIs(None, manager.last_shelf())
def test_unshelve_args_invalid_shelf_id(self):
tree = self.make_branch_and_tree('tree')
manager = tree.get_shelf_manager()
shelf_file = manager.new_shelf()[1]
try:
shelf_file.write('garbage')
finally:
shelf_file.close()
self.assertRaises(errors.InvalidShelfId,
shelf_ui.Unshelver.from_args, directory='tree',
action='delete-only', shelf_id='foo')
|