« back to all changes in this revision
Viewing changes to shelf_tests.py
- browse files at revision 301
- compare with another revision
- download diff
- download tarball
- view history from revision 301
- Committer: Aaron Bentley
- Date: 2005-12-14 14:33:05 UTC
- Revision ID: abentley@panoramicfeedback.com-20051214143305-42718d97f27c03bd
Avoided leaving junk all over the place when running standalone tests.
added
removed
shelf_tests.py
1
1
#!/usr/bin/python
2
2
3
import bzrlib.selftest
4
5
class ShelfTests(bzrlib.selftest.TestCaseInTempDir):
3
import bzrlib.tests
4
import os
5
class ShelfTests(bzrlib.tests.TestCaseInTempDir):
6
6
ORIGINAL = '\n\nhello test world\n\n'
7
7
MODIFIED = '\n\ngoodbye test world\n\n'
8
8
DIFF_HEADER = "=== modified file 'test_file'\n"
9
DIFF_1 = """--- test_file
10
+++ test_file
9
DIFF_1 = """--- test_file\t
10
+++ test_file\t
11
11
@@ -1,4 +1,4 @@
12
12
13
13
15
15
+goodbye test world
16
16
17
17
"""
18
DIFF_2 = """--- test_file
19
+++ test_file
18
DIFF_2 = """--- test_file\t
19
+++ test_file\t
20
20
@@ -1,4 +1,4 @@
21
21
22
22
30
30
31
31
# Create a test file and commit it
32
32
file('test_file', 'w').write(self.ORIGINAL)
33
b.add('test_file')
34
b.commit(message='add test_file')
33
b.working_tree().add('test_file')
34
b.working_tree().commit(message='add test_file')
35
35
36
36
# Modify the test file
37
37
file('test_file', 'w').write(self.MODIFIED)
38
38
39
39
# Check the diff is right
40
self.assertEqual(self.capture('diff'),
40
self.assertEqual(self.capture('diff', retcode=1),
41
41
self.DIFF_HEADER + self.DIFF_1 + '\n')
42
42
43
43
# Shelve the changes
44
self.run_bzr('shelve', '--all', retcode=True)
44
self.run_bzr('shelve', '--all', retcode=1)
45
45
46
46
# Make sure there is no diff anymore
47
47
self.assertEqual(self.capture('diff'), '')
54
54
self.assertEqual(shelf, self.DIFF_1)
55
55
56
56
# Unshelve
57
self.run_bzr('unshelve', retcode=True)
57
self.run_bzr('unshelve', retcode=1)
58
58
59
59
# Check the diff is right again
60
self.assertEqual(self.capture('diff'),
60
self.assertEqual(self.capture('diff', retcode=1),
61
61
self.DIFF_HEADER + self.DIFF_1 + '\n')
62
62
63
63
# Make sure the file is back the way it should be
70
70
71
71
# Create a test file and commit it
72
72
file('test_file', 'w').write(self.ORIGINAL)
73
b.add('test_file')
74
b.commit(message='add test_file')
73
b.working_tree().add('test_file')
74
b.working_tree().commit(message='add test_file')
75
75
76
76
# Shelve the changes
77
self.run_bzr('shelve', '--all', retcode=True)
77
self.run_bzr('shelve', '--all')
78
78
79
79
if os.path.exists('.bzr-shelf'):
80
80
self.fail("Shelf exists, but it shouldn't")
85
85
86
86
# Create a test file and commit it
87
87
file('test_file', 'w').write(self.ORIGINAL)
88
b.add('test_file')
89
b.commit(message='add test_file')
88
b.working_tree().add('test_file')
89
b.working_tree().commit(message='add test_file')
90
90
91
91
# Modify the test file and commit it
92
92
file('test_file', 'w').write(self.MODIFIED)
93
b.commit(message='update test_file')
93
b.working_tree().commit(message='update test_file')
94
94
95
95
# Shelve the changes
96
self.run_bzr('shelve', '-r', '1', '--all', retcode=True)
96
self.run_bzr('shelve', '-r', '1', '--all', retcode=1)
97
97
98
98
# Check the diff is right
99
self.assertEqual(self.capture('diff'),
99
self.assertEqual(self.capture('diff', retcode=1),
100
100
self.DIFF_HEADER + self.DIFF_2 + '\n')
101
101
102
102
# Make sure the file is the way it should be
103
103
self.assertEqual(file('test_file').read(), self.ORIGINAL)
104
104
105
105
# Unshelve
106
self.run_bzr('unshelve', retcode=True)
106
self.run_bzr('unshelve', retcode=1)
107
107
108
108
# Make sure the file is back the way it should be
109
109
self.assertEqual(file('test_file').read(), self.MODIFIED)
117
117
118
118
self.assertEqual(stderr.split('\n')[0],
119
119
'bzr: ERROR: shelve only accepts a single revision parameter.')
120
121
def test_shelf_with_whitespace(self):
122
"""Shows that bzr doesn't handle whitespace well"""
123
self.run_bzr('init')
124
file('file name', 'wb').write('hello')
125
self.run_bzr('add')
126
self.run_bzr('commit', '-m', 'added')
127
file('file name', 'wb').write('goodbye')
128
self.run_bzr('shelve', '--all', 'file name', retcode=1)
129
130
def test_whitespace_branches(self):
131
os.mkdir('name with space')
132
os.chdir('name with space')
133
self.run_bzr('init')
134
file('filename', 'wb').write('hello')
135
self.run_bzr('add')
136
self.run_bzr('commit', '-m', 'added')
137
file('filename', 'wb').write('goodbye')
138
self.run_bzr('shelve', '--all', 'filename', retcode=1)
139
os.chdir('..')
140
141
def test_long_filename(self):
142
"""Regression test for diffstat with long filenames.
143
144
Create a branch with two files, one of which has a long name. Commit.
145
Modify both files. Shelve the file with the short name. If diffstat
146
has regressed, it will generate a diffstat of the file with the long
147
name, and break.
148
"""
149
self.run_bzr('init')
150
filename = 'a' * 80
151
file(filename, 'wb').write('hello')
152
file('foo', 'wb').write('bar')
153
self.run_bzr('add')
154
self.run_bzr('commit', '-m', 'added')
155
file(filename, 'wb').write('goodbye')
156
file('foo', 'wb').write('baz')
157
self.run_bzr('shelve', '--all', 'foo', retcode=1)
158
Loggerhead is a web-based interface for Breezy
Version: 2.0.1