← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests.py

  • Committer: Michael Ellerman
  • Date: 2006-03-22 05:23:58 UTC
  • mto: (0.3.1 shelf-dev)
  • mto: This revision was merged to the branch mainline in revision 367.
  • Revision ID: michael@ellerman.id.au-20060322052358-4a7fda32faa2c5ce
Cleanup naming. PatchSource gives us back Patches not Hunks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests.py
1
1
#!/usr/bin/python
2
2
 
3
3
import bzrlib.tests
 
4
import os.path
4
5
 
5
 
class ShelfTests(bzrlib.tests.TestCaseInTempDir):
 
6
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
6
7
    ORIGINAL = '\n\nhello test world\n\n'
7
8
    MODIFIED = '\n\ngoodbye test world\n\n'
8
 
    DIFF_HEADER = "=== modified file 'test_file'\n"
9
 
    DIFF_1 = """--- test_file\t
10
 
+++ test_file\t
 
9
    DIFF_HEADER = "=== modified file 'a/test_file'\n"
 
10
    DIFF_1 = """--- a/test_file\t
 
11
+++ b/test_file\t
11
12
@@ -1,4 +1,4 @@
12
13
 
13
14
 
15
16
+goodbye test world
16
17
 
17
18
"""
18
 
    DIFF_2 = """--- test_file\t
19
 
+++ test_file\t
 
19
    DIFF_2 = """--- a/test_file\t
 
20
+++ b/test_file\t
20
21
@@ -1,4 +1,4 @@
21
22
 
22
23
 
31
32
        self.__test_loop(10)
32
33
 
33
34
    def __test_loop(self, count):
34
 
        from bzrlib.branch import Branch
35
 
        b = Branch.initialize('.')
36
 
 
37
 
        # Create a test file and commit it
38
 
        file('test_file', 'w').write(self.ORIGINAL)
39
 
        b.working_tree().add('test_file')
40
 
        b.working_tree().commit(message='add test_file')
 
35
        tree = self.make_branch_and_tree('.')
 
36
        self.__create_and_add_test_file(tree)
41
37
 
42
38
        while count > 0:
43
39
            count -= 1
50
46
                self.DIFF_HEADER + self.DIFF_1 + '\n')
51
47
 
52
48
            # Shelve the changes
53
 
            self.run_bzr('shelve', retcode=True)
 
49
            self.run_bzr('shelve', '--all', retcode=0)
54
50
 
55
51
            # Make sure there is no diff anymore
56
52
            self.assertEqual(self.capture('diff', retcode=0), '')
59
55
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
60
56
 
61
57
            # Check the shelf is right
62
 
            shelf = b._transport.get('.bzr/x-shelf/default/00').read()
 
58
            shelf = open(os.path.join(tree.branch.base,
 
59
                        '.shelf/shelves/default/00')).read()
 
60
            shelf = shelf[shelf.index('\n') + 1:] # skip the message
63
61
            self.assertEqual(shelf, self.DIFF_1)
64
62
 
65
63
            # Unshelve
66
 
            self.run_bzr('unshelve', retcode=True)
 
64
            self.run_bzr('unshelve', '--all', retcode=0)
67
65
 
68
66
            # Check the diff is right again
69
67
            self.assertEqual(self.capture('diff', retcode=1),
70
68
                self.DIFF_HEADER + self.DIFF_1 + '\n')
71
69
 
 
70
            # Check the shelved patch was backed up
 
71
            shelf = open(os.path.join(tree.branch.base,
 
72
                        '.shelf/shelves/default/00~')).read()
 
73
            shelf = shelf[shelf.index('\n') + 1:] # skip the message
 
74
            self.assertEqual(shelf, self.DIFF_1)
 
75
 
72
76
            # Make sure the file is back the way it should be
73
77
            self.assertEqual(file('test_file').read(), self.MODIFIED)
74
78
 
75
79
    def test_shelf_nothing_to_shelve(self):
76
80
        import os.path
77
 
        from bzrlib.branch import Branch
78
 
        b = Branch.initialize('.')
79
 
 
80
 
        # Create a test file and commit it
81
 
        file('test_file', 'w').write(self.ORIGINAL)
82
 
        b.working_tree().add('test_file')
83
 
        b.working_tree().commit(message='add test_file')
 
81
        tree = self.make_branch_and_tree('.')
 
82
        self.__create_and_add_test_file(tree)
84
83
 
85
84
        # Shelve the changes
86
 
        self.run_bzr('shelve', retcode=True)
 
85
        self.run_bzr('shelve', '--all', retcode=3)
87
86
 
88
 
        if b._transport.has('.bzr/x-shelf/default/00'):
 
87
        if os.path.exists(os.path.join(tree.branch.base,
 
88
                '.shelf/shelves/default/00')):
89
89
            self.fail("Shelf exists, but it shouldn't")
90
90
 
 
91
    def __create_and_add_test_file(self, tree, filename='test_file'):
 
92
        f = open(filename, 'w')
 
93
        f.write(self.ORIGINAL)
 
94
        f.close()
 
95
        tree.add(tree.relpath(os.path.join(os.getcwd(), filename)))
 
96
        tree.commit(message='add %s' % filename)
 
97
 
91
98
    def test_shelf_with_revision(self):
92
 
        from bzrlib.branch import Branch
93
 
        b = Branch.initialize('.')
 
99
        tree = self.make_branch_and_tree('.')
94
100
 
95
 
        # Create a test file and commit it
96
 
        file('test_file', 'w').write(self.ORIGINAL)
97
 
        b.working_tree().add('test_file')
98
 
        b.working_tree().commit(message='add test_file')
 
101
        self.__create_and_add_test_file(tree)
99
102
 
100
103
        # Modify the test file and commit it
101
 
        file('test_file', 'w').write(self.MODIFIED)
102
 
        b.working_tree().commit(message='update test_file')
 
104
        self.build_tree_contents([('test_file', self.MODIFIED)])
 
105
        tree.commit(message='update test_file')
103
106
 
104
107
        # Shelve the changes
105
 
        self.run_bzr('shelve', '-r', '1', retcode=True)
 
108
        self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
106
109
 
107
110
        # Check the diff is right
108
111
        self.assertEqual(self.capture('diff', retcode=1),
112
115
        self.assertEqual(file('test_file').read(), self.ORIGINAL)
113
116
 
114
117
        # Unshelve
115
 
        self.run_bzr('unshelve', retcode=True)
 
118
        self.run_bzr('unshelve', '--all', retcode=0)
116
119
 
117
120
        # Make sure the file is back the way it should be
118
121
        self.assertEqual(file('test_file').read(), self.MODIFIED)
119
122
 
120
123
    def test_shelf_with_two_revisions(self):
121
 
        from bzrlib.branch import Branch
122
 
        b = Branch.initialize('.')
 
124
        tree = self.make_branch_and_tree('.')
123
125
 
124
 
        cmd = 'shelve -r 1..2'
 
126
        cmd = 'shelve --all -r 1..2'
125
127
        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
126
128
 
127
129
        self.assertEqual(stderr.split('\n')[0],
128
 
            'bzr: ERROR: bzrlib.errors.BzrCommandError: shelve only ' \
129
 
                'accepts a single revision parameter.')
 
130
            'bzr: ERROR: shelve only accepts a single revision parameter.')
 
131
 
 
132
    def test_shelf_show_basic(self):
 
133
        tree = self.make_branch_and_tree('.')
 
134
        self.__create_and_add_test_file(tree)
 
135
        self.__test_show(tree, '00')
 
136
 
 
137
    def __test_show(self, tree, patch):
 
138
        # Modify the test file
 
139
        self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
 
140
 
 
141
        # Shelve the changes
 
142
        self.run_bzr('shelve', '--all', retcode=0)
 
143
 
 
144
        # Make sure there is no diff anymore
 
145
        self.assertEqual(self.capture('diff', retcode=0), '')
 
146
 
 
147
        # Check the shelf is right
 
148
        shelf = open(os.path.join(tree.branch.base,
 
149
                    '.shelf/shelves/default', patch)).read()
 
150
        self.assertTrue('patch %s' % patch in shelf)
 
151
 
 
152
        # Check the shown output is right
 
153
        shown = self.capture('shelf show %s' % patch, retcode=0)
 
154
        self.assertEqual(shown, shelf)
 
155
 
 
156
    def test_shelf_show_multi(self):
 
157
        tree = self.make_branch_and_tree('.')
 
158
        self.__create_and_add_test_file(tree)
 
159
        self.__test_show(tree, '00')
 
160
        self.__test_show(tree, '01')
 
161
        self.__test_show(tree, '02')
 
162
 
 
163
        # Now check we can show a previously shelved patch
 
164
        shelf = open(os.path.join(tree.branch.base,
 
165
                    '.shelf/shelves/default/00')).read()
 
166
        self.assertTrue('patch 00' in shelf)
 
167
 
 
168
        # Check the shown output is right
 
169
        shown = self.capture('shelf show 00', retcode=0)
 
170
        self.assertEqual(shown, shelf)
 
171
 
 
172
    def test_shelf_show_with_no_patch(self):
 
173
        tree = self.make_branch_and_tree('.')
 
174
        stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
 
175
        self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
 
176
 
 
177
    def test_shelf_unshelve_failure(self):
 
178
        tree = self.make_branch_and_tree('.')
 
179
 
 
180
        self.__create_and_add_test_file(tree)
 
181
 
 
182
        # Modify the test file
 
183
        file('test_file', 'w').write(self.MODIFIED)
 
184
 
 
185
        # Shelve the changes
 
186
        self.run_bzr('shelve', '--all', retcode=0)
 
187
 
 
188
        # Write an unapplyable patch into the shelf
 
189
        shelf = open(os.path.join(tree.branch.base,
 
190
                    '.shelf/shelves/default/00'), 'w')
 
191
        shelf.write(self.DIFF_2)
 
192
        shelf.close()
 
193
 
 
194
        # Unshelve, should fail
 
195
        self.run_bzr('unshelve', '--all', retcode=3)
 
196
 
 
197
        # Make sure the patch is still there, eventhough it's broken
 
198
        shelf = open(os.path.join(tree.branch.base,
 
199
                    '.shelf/shelves/default/00')).read()
 
200
        self.assertEqual(shelf, self.DIFF_2)
 
201
 
 
202
        # Working tree should be unchanged
 
203
        diff = self.capture('diff', retcode=0)
 
204
        self.assertEqual(diff, '')
 
205
 
 
206
    def test_shelf_unshelve_failure_two_hunks(self):
 
207
        tree = self.make_branch_and_tree('.')
 
208
 
 
209
        self.__create_and_add_test_file(tree)
 
210
        self.__create_and_add_test_file(tree, filename='test_file2')
 
211
 
 
212
        # Modify the test files
 
213
        file('test_file', 'w').write(self.MODIFIED)
 
214
        file('test_file2', 'w').write(self.MODIFIED)
 
215
 
 
216
        # Shelve the changes
 
217
        self.run_bzr('shelve', '--all', retcode=0)
 
218
 
 
219
        # Put the changes to test_file back, the shelved patch won't apply now
 
220
        file('test_file', 'w').write(self.MODIFIED)
 
221
        tree.commit(message='screw up test_file')
 
222
 
 
223
        # Unshelve, should fail
 
224
        self.run_bzr('unshelve', '--all', retcode=3)
 
225
 
 
226
        # Working tree should be unchanged
 
227
        diff = self.capture('diff', retcode=0)
 
228
        self.assertEqual(diff, '')
 
229
 
 
230
        # Force should succeed and modify test_file2, but leave shelf
 
231
        self.run_bzr('unshelve', '--force', '--all', retcode=0)
 
232
        self.assertEqual(open('test_file2').read(), self.MODIFIED)
 
233
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
 
234
 
 
235
    def test_shelf_after_unshelve(self):
 
236
        tree = self.make_branch_and_tree('.')
 
237
 
 
238
        self.__create_and_add_test_file(tree)
 
239
        self.__create_and_add_test_file(tree, filename='test_file2')
 
240
 
 
241
        # Modify the test files
 
242
        file('test_file', 'w').write(self.MODIFIED)
 
243
        file('test_file2', 'w').write(self.MODIFIED)
 
244
 
 
245
        # Shelve the changes
 
246
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
247
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
 
248
 
 
249
        # Unshelve
 
250
        self.run_bzr('unshelve', '--all', retcode=0)
 
251
 
 
252
        # We should now have 00 and 01~
 
253
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
 
254
        self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
 
255
 
 
256
        # Check ls works
 
257
        list = self.capture('shelf ls', retcode=0).split('\n')
 
258
        for line in list:
 
259
            self.assertFalse(line.startswith(' 01'))
 
260
 
 
261
        # Unshelve, if unshelve is confused by the backup it will fail
 
262
        self.run_bzr('unshelve', '--all', retcode=0)
 
263
 
 
264
    def test_shelf_delete(self):
 
265
        tree = self.make_branch_and_tree('.')
 
266
 
 
267
        self.__create_and_add_test_file(tree)
 
268
        self.__create_and_add_test_file(tree, filename='test_file2')
 
269
 
 
270
        # Modify the test files
 
271
        file('test_file', 'w').write(self.MODIFIED)
 
272
        file('test_file2', 'w').write(self.MODIFIED)
 
273
 
 
274
        # Shelve the changes
 
275
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
276
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
 
277
 
 
278
        # Check the shelf is right
 
279
        shelf = open(os.path.join(tree.branch.base,
 
280
                    '.shelf/shelves/default/00')).read()
 
281
        shelf = shelf[shelf.index('\n') + 1:] # skip the message
 
282
        self.assertEqual(shelf, self.DIFF_1)
 
283
 
 
284
        # Delete 00
 
285
        self.run_bzr('shelf', 'delete', '00', retcode=0)
 
286
 
 
287
        # We should now have 01 but not 00, but we should have 00~
 
288
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
 
289
        self.assertTrue(os.path.exists('.shelf/shelves/default/00~'))
 
290
        self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
 
291
 
 
292
        # Check the backup is right
 
293
        shelf = open(os.path.join(tree.branch.base,
 
294
                    '.shelf/shelves/default/00~')).read()
 
295
        shelf = shelf[shelf.index('\n') + 1:] # skip the message
 
296
        self.assertEqual(shelf, self.DIFF_1)
 
297
 
 
298
        # Check ls works
 
299
        list = self.capture('shelf ls', retcode=0).split('\n')
 
300
        for line in list:
 
301
            self.assertFalse(line.startswith(' 00'))
 
302
 
 
303
        # Unshelve should unshelve 01
 
304
        self.run_bzr('unshelve', '--all', retcode=0)
 
305
        self.assertEqual(file('test_file2').read(), self.MODIFIED)
 
306
 
 
307
    def test_shelf_gaps(self):
 
308
        tree = self.make_branch_and_tree('.')
 
309
        self.__create_and_add_test_file(tree)
 
310
        file('test_file', 'w').write(self.MODIFIED)
 
311
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
312
        file('test_file', 'w').write(self.MODIFIED)
 
313
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
314
 
 
315
        # Now delete 00, leaving 01, next shelve should go into 02
 
316
        self.run_bzr('shelf', 'delete', '0', retcode=0)
 
317
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
 
318
        self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
 
319
        file('test_file', 'w').write(self.MODIFIED)
 
320
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
321
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
 
322
        self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
 
323
 
 
324
    def test_shelf_upgrade(self):
 
325
        tree = self.make_branch_and_tree('.')
 
326
 
 
327
        self.__create_and_add_test_file(tree)
 
328
 
 
329
        # Modify then shelve, so we're not upgrading to 00, just for kicks
 
330
        file('test_file', 'w').write(self.MODIFIED)
 
331
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
332
 
 
333
        open('.bzr-shelf', 'w').write('First old shelf')
 
334
        open('.bzr-shelf-1', 'w').write('Second old shelf')
 
335
        open('.bzr-shelf-3', 'w').write('Fourth old shelf')
 
336
 
 
337
        # shelve and unshelve should bitch and do nothing
 
338
        file('test_file', 'w').write('blah blah blah')
 
339
        self.run_bzr('shelve', '--all', retcode=3)
 
340
        self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
 
341
        self.assertEqual(file('test_file').read(), 'blah blah blah')
 
342
        self.run_bzr('unshelve', '--all', retcode=3)
 
343
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
 
344
 
 
345
        # Upgrade, make sure it worked
 
346
        self.run_bzr('shelf', 'upgrade', retcode=0)
 
347
        self.assertEqual(open('.shelf/shelves/default/01').read(),
 
348
                'First old shelf')
 
349
        self.assertEqual(open('.shelf/shelves/default/02').read(),
 
350
                'Second old shelf')
 
351
        self.assertEqual(open('.shelf/shelves/default/03').read(),
 
352
                'Fourth old shelf')
 
353
 
 
354
        # Check the old shelves got backed up right
 
355
        self.assertTrue(os.path.exists('.bzr-shelf~'))
 
356
        self.assertTrue(os.path.exists('.bzr-shelf-1~'))
 
357
        self.assertTrue(os.path.exists('.bzr-shelf-3~'))
 
358
        self.assertFalse(os.path.exists('.bzr-shelf'))
 
359
        self.assertFalse(os.path.exists('.bzr-shelf-1'))
 
360
        self.assertFalse(os.path.exists('.bzr-shelf-3'))
 
361
 
 
362
        # Shelve should work now
 
363
        self.run_bzr('shelve', '--all', retcode=0)
 
364
 
 
365
    def test_shelf_p0_patch(self):
 
366
        tree = self.make_branch_and_tree('.')
 
367
 
 
368
        self.__create_and_add_test_file(tree)
 
369
 
 
370
        # Run a benign shelf command to setup .shelf for us
 
371
        self.run_bzr('shelf', 'ls', retcode=0)
 
372
 
 
373
        # Fake a -p0 shelved patch
 
374
        diff = self.DIFF_1
 
375
        diff = diff.replace('a/', '')
 
376
        diff = diff.replace('b/', '')
 
377
        open('.shelf/shelves/default/00', 'w').write(diff)
 
378
 
 
379
        # This should work
 
380
        self.run_bzr('unshelve', '--all', retcode=0)
 
381
 
 
382
        # Check the diff is right
 
383
        self.assertEqual(self.capture('diff', retcode=1),
 
384
            self.DIFF_HEADER + self.DIFF_1 + '\n')
 
385
 
 
386
    def test_shelf_shelve_in_subdir(self):
 
387
        tree = self.make_branch_and_tree('.')
 
388
 
 
389
        self.__create_and_add_test_file(tree)
 
390
 
 
391
        # Modify the test file
 
392
        file('test_file', 'w').write(self.MODIFIED)
 
393
 
 
394
        # Shelve the changes
 
395
        self.run_bzr('shelve', '--all', retcode=0)
 
396
 
 
397
        # Working tree should be unchanged
 
398
        diff = self.capture('diff', retcode=0)
 
399
        self.assertEqual(diff, '')
 
400
 
 
401
        # Unshelve, should succeed
 
402
        self.run_bzr('unshelve', '--all', retcode=0)
 
403
 
 
404
        # Check the diff is right
 
405
        self.assertEqual(self.capture('diff', retcode=1),
 
406
            self.DIFF_HEADER + self.DIFF_1 + '\n')