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
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
|
# Copyright (C) 2005 by Canonical Ltd
# -*- coding: utf-8 -*-
# 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
"""Black-box tests for bzr.
These check that it behaves properly when it's invoked through the regular
command-line interface.
This always reinvokes bzr through a new Python interpreter, which is a
bit inefficient but arguably tests in a way more representative of how
it's normally invoked.
"""
import sys
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
class ExternalBase(TestCaseInTempDir):
def runbzr(self, args, retcode=0,backtick=False):
try:
import shutil
from subprocess import call
except ImportError, e:
_need_subprocess()
raise
if isinstance(args, basestring):
args = args.split()
if backtick:
return self.backtick(['python', self.BZRPATH,] + args,
retcode=retcode)
else:
return self.runcmd(['python', self.BZRPATH,] + args,
retcode=retcode)
class TestCommands(ExternalBase):
def test_help_commands(self):
self.runbzr('--help')
self.runbzr('help')
self.runbzr('help commands')
self.runbzr('help help')
self.runbzr('commit -h')
def test_init_branch(self):
import os
self.runbzr(['init'])
def test_whoami(self):
# this should always identify something, if only "john@localhost"
self.runbzr("whoami")
self.runbzr("whoami --email")
self.assertEquals(self.runbzr("whoami --email",
backtick=True).count('@'), 1)
def test_whoami_branch(self):
"""branch specific user identity works."""
self.runbzr('init')
f = file('.bzr/email', 'wt')
f.write('Branch Identity <branch@identi.ty>')
f.close()
whoami = self.runbzr("whoami",backtick=True)
whoami_email = self.runbzr("whoami --email",backtick=True)
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
def test_invalid_commands(self):
self.runbzr("pants", retcode=1)
self.runbzr("--pants off", retcode=1)
self.runbzr("diff --message foo", retcode=1)
def test_empty_commit(self):
self.runbzr("init")
self.build_tree(['hello.txt'])
self.runbzr("commit -m empty", retcode=1)
self.runbzr("add hello.txt")
self.runbzr("commit -m added")
def test_ignore_patterns(self):
from bzrlib.branch import Branch
b = Branch('.', init=True)
self.assertEquals(list(b.unknowns()), [])
file('foo.tmp', 'wt').write('tmp files are ignored')
self.assertEquals(list(b.unknowns()), [])
assert self.backtick('bzr unknowns') == ''
file('foo.c', 'wt').write('int main() {}')
self.assertEquals(list(b.unknowns()), ['foo.c'])
assert self.backtick('bzr unknowns') == 'foo.c\n'
self.runbzr(['add', 'foo.c'])
assert self.backtick('bzr unknowns') == ''
# 'ignore' works when creating the .bzignore file
file('foo.blah', 'wt').write('blah')
self.assertEquals(list(b.unknowns()), ['foo.blah'])
self.runbzr('ignore *.blah')
self.assertEquals(list(b.unknowns()), [])
assert file('.bzrignore', 'rb').read() == '*.blah\n'
# 'ignore' works when then .bzrignore file already exists
file('garh', 'wt').write('garh')
self.assertEquals(list(b.unknowns()), ['garh'])
assert self.backtick('bzr unknowns') == 'garh\n'
self.runbzr('ignore garh')
self.assertEquals(list(b.unknowns()), [])
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
def test_revert(self):
import os
self.runbzr('init')
file('hello', 'wt').write('foo')
self.runbzr('add hello')
self.runbzr('commit -m setup hello')
file('goodbye', 'wt').write('baz')
self.runbzr('add goodbye')
self.runbzr('commit -m setup goodbye')
file('hello', 'wt').write('bar')
file('goodbye', 'wt').write('qux')
self.runbzr('revert hello')
self.check_file_contents('hello', 'foo')
self.check_file_contents('goodbye', 'qux')
self.runbzr('revert')
self.check_file_contents('goodbye', 'baz')
os.mkdir('revertdir')
self.runbzr('add revertdir')
self.runbzr('commit -m f')
os.rmdir('revertdir')
self.runbzr('revert')
def skipped_test_mv_modes(self):
"""Test two modes of operation for mv"""
from bzrlib.branch import Branch
b = Branch('.', init=True)
self.build_tree(['a', 'c', 'subdir/'])
self.run_bzr('mv', 'a', 'b')
self.run_bzr('mv', 'b', 'subdir')
self.run_bzr('mv', 'subdir/b', 'a')
self.run_bzr('mv', 'a', 'b', 'subdir')
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
def test_main_version(self):
"""Check output from version command and master option is reasonable"""
# output is intentionally passed through to stdout so that we
# can see the version being tested
output = self.runbzr('version', backtick=1)
self.log('bzr version output:')
self.log(output)
self.assert_(output.startswith('bzr (bazaar-ng) '))
self.assertNotEqual(output.index('Canonical'), -1)
# make sure --version is consistent
tmp_output = self.runbzr('--version', backtick=1)
self.log('bzr --version output:')
self.log(tmp_output)
self.assertEquals(output, tmp_output)
def example_branch(test):
test.runbzr('init')
file('hello', 'wt').write('foo')
test.runbzr('add hello')
test.runbzr('commit -m setup hello')
file('goodbye', 'wt').write('baz')
test.runbzr('add goodbye')
test.runbzr('commit -m setup goodbye')
def test_revert(self):
self.example_branch()
file('hello', 'wt').write('bar')
file('goodbye', 'wt').write('qux')
self.runbzr('revert hello')
self.check_file_contents('hello', 'foo')
self.check_file_contents('goodbye', 'qux')
self.runbzr('revert')
self.check_file_contents('goodbye', 'baz')
def test_merge(self):
from bzrlib.branch import Branch
from bzrlib.commands import run_bzr
import os
os.mkdir('a')
os.chdir('a')
self.example_branch()
os.chdir('..')
self.runbzr('branch a b')
os.chdir('b')
file('goodbye', 'wt').write('quux')
self.runbzr(['commit', '-m', "more u's are always good"])
os.chdir('../a')
file('hello', 'wt').write('quuux')
# We can't merge when there are in-tree changes
self.runbzr('merge ../b', retcode=1)
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
self.runbzr('merge ../b')
self.check_file_contents('goodbye', 'quux')
# Merging a branch pulls its revision into the tree
a = Branch('.')
b = Branch('../b')
a.get_revision_xml(b.last_patch())
self.log('pending merges: %s', a.pending_merges())
# assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
# % (a.pending_merges(), b.last_patch())
class OldTests(ExternalBase):
"""old tests moved from ./testbzr."""
def test_bzr(self):
from os import chdir, mkdir
from os.path import exists
import os
runbzr = self.runbzr
backtick = self.backtick
progress = self.log
progress("basic branch creation")
mkdir('branch1')
chdir('branch1')
runbzr('init')
self.assertEquals(backtick('bzr root').rstrip(),
os.path.join(self.test_dir, 'branch1'))
progress("status of new file")
f = file('test.txt', 'wt')
f.write('hello world!\n')
f.close()
out = backtick("bzr unknowns")
self.assertEquals(out, 'test.txt\n')
out = backtick("bzr status")
assert out == 'unknown:\n test.txt\n'
out = backtick("bzr status --all")
assert out == "unknown:\n test.txt\n"
out = backtick("bzr status test.txt --all")
assert out == "unknown:\n test.txt\n"
f = file('test2.txt', 'wt')
f.write('goodbye cruel world...\n')
f.close()
out = backtick("bzr status test.txt")
assert out == "unknown:\n test.txt\n"
out = backtick("bzr status")
assert out == ("unknown:\n"
" test.txt\n"
" test2.txt\n")
os.unlink('test2.txt')
progress("command aliases")
out = backtick("bzr st --all")
assert out == ("unknown:\n"
" test.txt\n")
out = backtick("bzr stat")
assert out == ("unknown:\n"
" test.txt\n")
progress("command help")
runbzr("help st")
runbzr("help")
runbzr("help commands")
runbzr("help slartibartfast", 1)
out = backtick("bzr help ci")
out.index('aliases: ')
progress("can't rename unversioned file")
runbzr("rename test.txt new-test.txt", 1)
progress("adding a file")
runbzr("add test.txt")
assert backtick("bzr unknowns") == ''
assert backtick("bzr status --all") == ("added:\n"
" test.txt\n")
progress("rename newly-added file")
runbzr("rename test.txt hello.txt")
assert os.path.exists("hello.txt")
assert not os.path.exists("test.txt")
assert backtick("bzr revno") == '0\n'
progress("add first revision")
runbzr(['commit', '-m', 'add first revision'])
progress("more complex renames")
os.mkdir("sub1")
runbzr("rename hello.txt sub1", 1)
runbzr("rename hello.txt sub1/hello.txt", 1)
runbzr("move hello.txt sub1", 1)
runbzr("add sub1")
runbzr("rename sub1 sub2")
runbzr("move hello.txt sub2")
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
assert exists("sub2")
assert exists("sub2/hello.txt")
assert not exists("sub1")
assert not exists("hello.txt")
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
mkdir("sub1")
runbzr('add sub1')
runbzr('move sub2/hello.txt sub1')
assert not exists('sub2/hello.txt')
assert exists('sub1/hello.txt')
runbzr('move sub2 sub1')
assert not exists('sub2')
assert exists('sub1/sub2')
runbzr(['commit', '-m', 'rename nested subdirectories'])
chdir('sub1/sub2')
self.assertEquals(backtick('bzr root')[:-1],
os.path.join(self.test_dir, 'branch1'))
runbzr('move ../hello.txt .')
assert exists('./hello.txt')
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
runbzr(['commit', '-m', 'move to parent directory'])
chdir('..')
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
runbzr('move sub2/hello.txt .')
assert exists('hello.txt')
f = file('hello.txt', 'wt')
f.write('some nice new content\n')
f.close()
f = file('msg.tmp', 'wt')
f.write('this is my new commit\n')
f.close()
runbzr('commit -F msg.tmp')
assert backtick('bzr revno') == '5\n'
runbzr('export -r 5 export-5.tmp')
runbzr('export export.tmp')
runbzr('log')
runbzr('log -v')
runbzr('log -v --forward')
runbzr('log -m', retcode=1)
log_out = backtick('bzr log -m commit')
assert "this is my new commit" in log_out
assert "rename nested" not in log_out
assert 'revision-id' not in log_out
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
progress("file with spaces in name")
mkdir('sub directory')
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
runbzr('add .')
runbzr('diff')
runbzr('commit -m add-spaces')
runbzr('check')
runbzr('log')
runbzr('log --forward')
runbzr('info')
|