« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 826
- compare with another revision
- download diff
- download tarball
- view history from revision 826
- Committer: Martin Pool
- Date: 2005-07-05 08:20:41 UTC
- Revision ID: mbp@sourcefrog.net-20050705082041-6538a9ec26f7a59d
- Actually merge unsynchronized regions. Woot!
- files added:
- bzrlib/statcache.py
- plugins/changeset
- plugins/rsync
- files removed:
- HACKING
- bzrlib/util
- contrib/emacs
- tools
- files renamed:
- bzrlib/util/effbot/ => effbot/
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/plugins/ => plugins/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/selftest/blackbox.py
26
26
it's normally invoked.
27
27
"""
28
28
29
import sys
30
31
from bzrlib.selftest import TestBase, InTempDir, BzrTestBase
32
33
34
35
class ExternalBase(InTempDir):
36
def runbzr(self, args, retcode=0):
37
try:
38
import shutil
39
from subprocess import call
40
except ImportError, e:
41
_need_subprocess()
42
raise
43
44
if isinstance(args, basestring):
45
args = args.split()
46
47
return self.runcmd(['python', self.BZRPATH,] + args,
48
retcode=retcode)
49
50
51
52
class MvCommand(BzrTestBase):
53
def runbzr(self):
54
"""Test two modes of operation for mv"""
55
b = Branch('.', init=True)
56
self.build_tree(['a', 'c', 'subdir/'])
57
self.run_bzr('mv', 'a', 'b')
58
self.run_bzr('mv', 'b', 'subdir')
59
self.run_bzr('mv', 'subdir/b', 'a')
60
self.run_bzr('mv', 'a', 'b', 'subdir')
61
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
62
63
64
65
class TestVersion(BzrTestBase):
66
"""Check output from version command and master option is reasonable"""
29
# this code was previously in testbzr
30
31
from unittest import TestCase
32
from bzrlib.selftest import TestBase, InTempDir
33
34
class TestVersion(TestBase):
67
35
def runTest(self):
68
36
# output is intentionally passed through to stdout so that we
69
37
# can see the version being tested
70
from cStringIO import StringIO
71
save_out = sys.stdout
72
try:
73
sys.stdout = tmp_out = StringIO()
74
75
self.run_bzr('version')
76
finally:
77
sys.stdout = save_out
78
79
output = tmp_out.getvalue()
80
self.log('bzr version output:')
81
self.log(output)
82
83
self.assert_(output.startswith('bzr (bazaar-ng) '))
84
self.assertNotEqual(output.index('Canonical'), -1)
85
86
# make sure --version is consistent
87
try:
88
sys.stdout = tmp_out = StringIO()
89
90
self.run_bzr('--version')
91
finally:
92
sys.stdout = save_out
93
94
self.log('bzr --version output:')
95
self.log(tmp_out.getvalue())
96
97
self.assertEquals(output, tmp_out.getvalue())
98
99
100
101
102
103
class HelpCommands(ExternalBase):
38
self.runcmd(['bzr', 'version'])
39
40
41
42
class HelpCommands(TestBase):
104
43
def runTest(self):
105
self.runbzr('--help')
106
self.runbzr('help')
107
self.runbzr('help commands')
108
self.runbzr('help help')
109
self.runbzr('commit -h')
110
111
112
class InitBranch(ExternalBase):
44
self.runcmd('bzr --help')
45
self.runcmd('bzr help')
46
self.runcmd('bzr help commands')
47
self.runcmd('bzr help help')
48
self.runcmd('bzr commit -h')
49
50
51
class InitBranch(InTempDir):
113
52
def runTest(self):
114
53
import os
115
self.runbzr(['init'])
116
117
118
119
class UserIdentity(ExternalBase):
54
self.runcmd(['bzr', 'init'])
55
56
57
58
class UserIdentity(InTempDir):
120
59
def runTest(self):
121
60
# this should always identify something, if only "john@localhost"
122
self.runbzr("whoami")
123
self.runbzr("whoami --email")
61
self.runcmd("bzr whoami")
62
self.runcmd("bzr whoami --email")
124
63
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
125
64
1)
126
65
127
66
128
class InvalidCommands(ExternalBase):
129
def runTest(self):
130
self.runbzr("pants", retcode=1)
131
self.runbzr("--pants off", retcode=1)
132
self.runbzr("diff --message foo", retcode=1)
133
134
135
136
class EmptyCommit(ExternalBase):
137
def runTest(self):
138
self.runbzr("init")
139
self.build_tree(['hello.txt'])
140
self.runbzr("commit -m empty", retcode=1)
141
self.runbzr("add hello.txt")
142
self.runbzr("commit -m added")
143
144
145
146
class IgnorePatterns(ExternalBase):
147
def runTest(self):
148
from bzrlib.branch import Branch
149
150
b = Branch('.', init=True)
151
self.assertEquals(list(b.unknowns()), [])
152
153
file('foo.tmp', 'wt').write('tmp files are ignored')
154
self.assertEquals(list(b.unknowns()), [])
155
assert self.backtick('bzr unknowns') == ''
156
157
file('foo.c', 'wt').write('int main() {}')
158
self.assertEquals(list(b.unknowns()), ['foo.c'])
159
assert self.backtick('bzr unknowns') == 'foo.c\n'
160
161
self.runbzr(['add', 'foo.c'])
162
assert self.backtick('bzr unknowns') == ''
163
164
# 'ignore' works when creating the .bzignore file
165
file('foo.blah', 'wt').write('blah')
166
self.assertEquals(list(b.unknowns()), ['foo.blah'])
167
self.runbzr('ignore *.blah')
168
self.assertEquals(list(b.unknowns()), [])
169
assert file('.bzrignore', 'rb').read() == '*.blah\n'
170
171
# 'ignore' works when then .bzrignore file already exists
172
file('garh', 'wt').write('garh')
173
self.assertEquals(list(b.unknowns()), ['garh'])
174
assert self.backtick('bzr unknowns') == 'garh\n'
175
self.runbzr('ignore garh')
176
self.assertEquals(list(b.unknowns()), [])
177
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
178
179
180
181
182
class OldTests(ExternalBase):
67
class InvalidCommands(InTempDir):
68
def runTest(self):
69
self.runcmd("bzr pants", retcode=1)
70
self.runcmd("bzr --pants off", retcode=1)
71
self.runcmd("bzr diff --message foo", retcode=1)
72
73
74
75
class OldTests(InTempDir):
183
76
# old tests moved from ./testbzr
184
77
def runTest(self):
185
78
from os import chdir, mkdir
186
79
from os.path import exists
187
80
import os
188
81
189
runbzr = self.runbzr
82
runcmd = self.runcmd
190
83
backtick = self.backtick
191
84
progress = self.log
192
85
193
86
progress("basic branch creation")
194
mkdir('branch1')
87
runcmd(['mkdir', 'branch1'])
195
88
chdir('branch1')
196
runbzr('init')
89
runcmd('bzr init')
197
90
198
91
self.assertEquals(backtick('bzr root').rstrip(),
199
92
os.path.join(self.test_dir, 'branch1'))
240
133
" test.txt\n")
241
134
242
135
progress("command help")
243
runbzr("help st")
244
runbzr("help")
245
runbzr("help commands")
246
runbzr("help slartibartfast", 1)
136
runcmd("bzr help st")
137
runcmd("bzr help")
138
runcmd("bzr help commands")
139
runcmd("bzr help slartibartfast", 1)
247
140
248
141
out = backtick("bzr help ci")
249
142
out.index('aliases: ')
250
143
251
144
progress("can't rename unversioned file")
252
runbzr("rename test.txt new-test.txt", 1)
145
runcmd("bzr rename test.txt new-test.txt", 1)
253
146
254
147
progress("adding a file")
255
148
256
runbzr("add test.txt")
149
runcmd("bzr add test.txt")
257
150
assert backtick("bzr unknowns") == ''
258
151
assert backtick("bzr status --all") == ("added:\n"
259
152
" test.txt\n")
260
153
261
154
progress("rename newly-added file")
262
runbzr("rename test.txt hello.txt")
155
runcmd("bzr rename test.txt hello.txt")
263
156
assert os.path.exists("hello.txt")
264
157
assert not os.path.exists("test.txt")
265
158
266
159
assert backtick("bzr revno") == '0\n'
267
160
268
161
progress("add first revision")
269
runbzr(['commit', '-m', 'add first revision'])
162
runcmd(["bzr", "commit", "-m", 'add first revision'])
270
163
271
164
progress("more complex renames")
272
165
os.mkdir("sub1")
273
runbzr("rename hello.txt sub1", 1)
274
runbzr("rename hello.txt sub1/hello.txt", 1)
275
runbzr("move hello.txt sub1", 1)
166
runcmd("bzr rename hello.txt sub1", 1)
167
runcmd("bzr rename hello.txt sub1/hello.txt", 1)
168
runcmd("bzr move hello.txt sub1", 1)
276
169
277
runbzr("add sub1")
278
runbzr("rename sub1 sub2")
279
runbzr("move hello.txt sub2")
170
runcmd("bzr add sub1")
171
runcmd("bzr rename sub1 sub2")
172
runcmd("bzr move hello.txt sub2")
280
173
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
281
174
282
175
assert exists("sub2")
284
177
assert not exists("sub1")
285
178
assert not exists("hello.txt")
286
179
287
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
180
runcmd(['bzr', 'commit', '-m', 'commit with some things moved to subdirs'])
288
181
289
182
mkdir("sub1")
290
runbzr('add sub1')
291
runbzr('move sub2/hello.txt sub1')
183
runcmd('bzr add sub1')
184
runcmd('bzr move sub2/hello.txt sub1')
292
185
assert not exists('sub2/hello.txt')
293
186
assert exists('sub1/hello.txt')
294
runbzr('move sub2 sub1')
187
runcmd('bzr move sub2 sub1')
295
188
assert not exists('sub2')
296
189
assert exists('sub1/sub2')
297
190
298
runbzr(['commit', '-m', 'rename nested subdirectories'])
191
runcmd(['bzr', 'commit', '-m', 'rename nested subdirectories'])
299
192
300
193
chdir('sub1/sub2')
301
194
self.assertEquals(backtick('bzr root')[:-1],
302
195
os.path.join(self.test_dir, 'branch1'))
303
runbzr('move ../hello.txt .')
196
runcmd('bzr move ../hello.txt .')
304
197
assert exists('./hello.txt')
305
198
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
306
199
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
307
runbzr(['commit', '-m', 'move to parent directory'])
200
runcmd(['bzr', 'commit', '-m', 'move to parent directory'])
308
201
chdir('..')
309
202
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
310
203
311
runbzr('move sub2/hello.txt .')
204
runcmd('bzr move sub2/hello.txt .')
312
205
assert exists('hello.txt')
313
206
314
207
f = file('hello.txt', 'wt')
319
212
f.write('this is my new commit\n')
320
213
f.close()
321
214
322
runbzr('commit -F msg.tmp')
215
runcmd('bzr commit -F msg.tmp')
323
216
324
217
assert backtick('bzr revno') == '5\n'
325
runbzr('export -r 5 export-5.tmp')
326
runbzr('export export.tmp')
327
328
runbzr('log')
329
runbzr('log -v')
330
runbzr('log -v --forward')
331
runbzr('log -m', retcode=1)
332
log_out = backtick('bzr log -m commit')
333
assert "this is my new commit" in log_out
334
assert "rename nested" not in log_out
335
assert 'revision-id' not in log_out
336
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
218
runcmd('bzr export -r 5 export-5.tmp')
219
runcmd('bzr export export.tmp')
220
221
runcmd('bzr log')
222
runcmd('bzr log -v')
223
337
224
338
225
339
226
progress("file with spaces in name")
340
227
mkdir('sub directory')
341
228
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
342
runbzr('add .')
343
runbzr('diff')
344
runbzr('commit -m add-spaces')
345
runbzr('check')
346
347
runbzr('log')
348
runbzr('log --forward')
349
350
runbzr('info')
351
352
353
354
355
356
357
class RevertCommand(ExternalBase):
229
runcmd('bzr add .')
230
runcmd('bzr diff')
231
runcmd('bzr commit -m add-spaces')
232
runcmd('bzr check')
233
234
runcmd('bzr log')
235
runcmd('bzr log --forward')
236
237
runcmd('bzr info')
238
239
240
241
242
243
244
chdir('..')
245
chdir('..')
246
progress('branch')
247
# Can't create a branch if it already exists
248
runcmd('bzr branch branch1', retcode=1)
249
# Can't create a branch if its parent doesn't exist
250
runcmd('bzr branch /unlikely/to/exist', retcode=1)
251
runcmd('bzr branch branch1 branch2')
252
253
progress("pull")
254
chdir('branch1')
255
runcmd('bzr pull', retcode=1)
256
runcmd('bzr pull ../branch2')
257
chdir('.bzr')
258
runcmd('bzr pull')
259
runcmd('bzr commit -m empty')
260
runcmd('bzr pull')
261
chdir('../../branch2')
262
runcmd('bzr pull')
263
runcmd('bzr commit -m empty')
264
chdir('../branch1')
265
runcmd('bzr commit -m empty')
266
runcmd('bzr pull', retcode=1)
267
chdir ('..')
268
269
progress('status after remove')
270
mkdir('status-after-remove')
271
# see mail from William Dodé, 2005-05-25
272
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
273
# * looking for changes...
274
# added a
275
# * commited r1
276
# $ bzr remove a
277
# $ bzr status
278
# bzr: local variable 'kind' referenced before assignment
279
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
280
# see ~/.bzr.log for debug information
281
chdir('status-after-remove')
282
runcmd('bzr init')
283
file('a', 'w').write('foo')
284
runcmd('bzr add a')
285
runcmd(['bzr', 'commit', '-m', 'add a'])
286
runcmd('bzr remove a')
287
runcmd('bzr status')
288
289
chdir('..')
290
291
progress('ignore patterns')
292
mkdir('ignorebranch')
293
chdir('ignorebranch')
294
runcmd('bzr init')
295
assert backtick('bzr unknowns') == ''
296
297
file('foo.tmp', 'wt').write('tmp files are ignored')
298
assert backtick('bzr unknowns') == ''
299
300
file('foo.c', 'wt').write('int main() {}')
301
assert backtick('bzr unknowns') == 'foo.c\n'
302
runcmd('bzr add foo.c')
303
assert backtick('bzr unknowns') == ''
304
305
# 'ignore' works when creating the .bzignore file
306
file('foo.blah', 'wt').write('blah')
307
assert backtick('bzr unknowns') == 'foo.blah\n'
308
runcmd('bzr ignore *.blah')
309
assert backtick('bzr unknowns') == ''
310
assert file('.bzrignore', 'rb').read() == '*.blah\n'
311
312
# 'ignore' works when then .bzrignore file already exists
313
file('garh', 'wt').write('garh')
314
assert backtick('bzr unknowns') == 'garh\n'
315
runcmd('bzr ignore garh')
316
assert backtick('bzr unknowns') == ''
317
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
318
319
chdir('..')
320
321
322
323
324
progress("recursive and non-recursive add")
325
mkdir('no-recurse')
326
chdir('no-recurse')
327
runcmd('bzr init')
328
mkdir('foo')
329
fp = os.path.join('foo', 'test.txt')
330
f = file(fp, 'w')
331
f.write('hello!\n')
332
f.close()
333
runcmd('bzr add --no-recurse foo')
334
runcmd('bzr file-id foo')
335
runcmd('bzr file-id ' + fp, 1) # not versioned yet
336
runcmd('bzr commit -m add-dir-only')
337
338
runcmd('bzr file-id ' + fp, 1) # still not versioned
339
340
runcmd('bzr add foo')
341
runcmd('bzr file-id ' + fp)
342
runcmd('bzr commit -m add-sub-file')
343
344
chdir('..')
345
346
347
348
class RevertCommand(InTempDir):
358
349
def runTest(self):
359
self.runbzr('init')
350
self.runcmd('bzr init')
360
351
361
352
file('hello', 'wt').write('foo')
362
self.runbzr('add hello')
363
self.runbzr('commit -m setup hello')
364
365
file('goodbye', 'wt').write('baz')
366
self.runbzr('add goodbye')
367
self.runbzr('commit -m setup goodbye')
353
self.runcmd('bzr add hello')
354
self.runcmd('bzr commit -m setup hello')
368
355
369
356
file('hello', 'wt').write('bar')
370
file('goodbye', 'wt').write('qux')
371
self.runbzr('revert hello')
357
self.runcmd('bzr revert hello')
372
358
self.check_file_contents('hello', 'foo')
373
self.check_file_contents('goodbye', 'qux')
374
self.runbzr('revert')
375
self.check_file_contents('goodbye', 'baz')
376
359
360
361
362
363
364
# lists all tests from this module in the best order to run them. we
365
# do it this way rather than just discovering them all because it
366
# allows us to test more basic functions first where failures will be
367
# easiest to understand.
368
369
def suite():
370
from unittest import TestSuite
371
s = TestSuite()
372
s.addTests([TestVersion(),
373
InitBranch(),
374
HelpCommands(),
375
UserIdentity(),
376
InvalidCommands(),
377
RevertCommand(),
378
OldTests(),
379
])
380
return s
Loggerhead is a web-based interface for Breezy
Version: 2.0.1