1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Black-box tests for bzr.
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface.
24
This always reinvokes bzr through a new Python interpreter, which is a
25
bit inefficient but arguably tests in a way more representative of how
26
it's normally invoked.
32
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
33
from bzrlib.branch import Branch
34
from bzrlib.commands import run_bzr
37
class ExternalBase(TestCaseInTempDir):
38
def runbzr(self, args, retcode=0,backtick=False):
39
if isinstance(args, basestring):
43
return self.backtick(['python', self.BZRPATH,] + args,
46
return self.runcmd(['python', self.BZRPATH,] + args,
50
class TestCommands(ExternalBase):
52
def test_help_commands(self):
55
self.runbzr('help commands')
56
self.runbzr('help help')
57
self.runbzr('commit -h')
59
def test_init_branch(self):
62
def test_whoami(self):
63
# this should always identify something, if only "john@localhost"
65
self.runbzr("whoami --email")
67
self.assertEquals(self.runbzr("whoami --email",
68
backtick=True).count('@'), 1)
70
def test_whoami_branch(self):
71
"""branch specific user identity works."""
73
f = file('.bzr/email', 'wt')
74
f.write('Branch Identity <branch@identi.ty>')
76
whoami = self.runbzr("whoami",backtick=True)
77
whoami_email = self.runbzr("whoami --email",backtick=True)
78
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
79
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
81
def test_invalid_commands(self):
82
self.runbzr("pants", retcode=1)
83
self.runbzr("--pants off", retcode=1)
84
self.runbzr("diff --message foo", retcode=1)
86
def test_empty_commit(self):
88
self.build_tree(['hello.txt'])
89
self.runbzr("commit -m empty", retcode=1)
90
self.runbzr("add hello.txt")
91
self.runbzr("commit -m added")
93
def test_ignore_patterns(self):
94
from bzrlib.branch import Branch
96
b = Branch('.', init=True)
97
self.assertEquals(list(b.unknowns()), [])
99
file('foo.tmp', 'wt').write('tmp files are ignored')
100
self.assertEquals(list(b.unknowns()), [])
101
assert self.backtick('bzr unknowns') == ''
103
file('foo.c', 'wt').write('int main() {}')
104
self.assertEquals(list(b.unknowns()), ['foo.c'])
105
assert self.backtick('bzr unknowns') == 'foo.c\n'
107
self.runbzr(['add', 'foo.c'])
108
assert self.backtick('bzr unknowns') == ''
110
# 'ignore' works when creating the .bzignore file
111
file('foo.blah', 'wt').write('blah')
112
self.assertEquals(list(b.unknowns()), ['foo.blah'])
113
self.runbzr('ignore *.blah')
114
self.assertEquals(list(b.unknowns()), [])
115
assert file('.bzrignore', 'rb').read() == '*.blah\n'
117
# 'ignore' works when then .bzrignore file already exists
118
file('garh', 'wt').write('garh')
119
self.assertEquals(list(b.unknowns()), ['garh'])
120
assert self.backtick('bzr unknowns') == 'garh\n'
121
self.runbzr('ignore garh')
122
self.assertEquals(list(b.unknowns()), [])
123
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
125
def test_revert(self):
128
file('hello', 'wt').write('foo')
129
self.runbzr('add hello')
130
self.runbzr('commit -m setup hello')
132
file('goodbye', 'wt').write('baz')
133
self.runbzr('add goodbye')
134
self.runbzr('commit -m setup goodbye')
136
file('hello', 'wt').write('bar')
137
file('goodbye', 'wt').write('qux')
138
self.runbzr('revert hello')
139
self.check_file_contents('hello', 'foo')
140
self.check_file_contents('goodbye', 'qux')
141
self.runbzr('revert')
142
self.check_file_contents('goodbye', 'baz')
144
os.mkdir('revertdir')
145
self.runbzr('add revertdir')
146
self.runbzr('commit -m f')
147
os.rmdir('revertdir')
148
self.runbzr('revert')
150
def skipped_test_mv_modes(self):
151
"""Test two modes of operation for mv"""
152
from bzrlib.branch import Branch
153
b = Branch('.', init=True)
154
self.build_tree(['a', 'c', 'subdir/'])
155
self.run_bzr('mv', 'a', 'b')
156
self.run_bzr('mv', 'b', 'subdir')
157
self.run_bzr('mv', 'subdir/b', 'a')
158
self.run_bzr('mv', 'a', 'b', 'subdir')
159
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
161
def test_main_version(self):
162
"""Check output from version command and master option is reasonable"""
163
# output is intentionally passed through to stdout so that we
164
# can see the version being tested
165
output = self.runbzr('version', backtick=1)
166
self.log('bzr version output:')
168
self.assert_(output.startswith('bzr (bazaar-ng) '))
169
self.assertNotEqual(output.index('Canonical'), -1)
170
# make sure --version is consistent
171
tmp_output = self.runbzr('--version', backtick=1)
172
self.log('bzr --version output:')
174
self.assertEquals(output, tmp_output)
176
def example_branch(test):
178
file('hello', 'wt').write('foo')
179
test.runbzr('add hello')
180
test.runbzr('commit -m setup hello')
181
file('goodbye', 'wt').write('baz')
182
test.runbzr('add goodbye')
183
test.runbzr('commit -m setup goodbye')
185
def test_revert(self):
186
self.example_branch()
187
file('hello', 'wt').write('bar')
188
file('goodbye', 'wt').write('qux')
189
self.runbzr('revert hello')
190
self.check_file_contents('hello', 'foo')
191
self.check_file_contents('goodbye', 'qux')
192
self.runbzr('revert')
193
self.check_file_contents('goodbye', 'baz')
195
def test_merge(self):
196
from bzrlib.branch import Branch
200
self.example_branch()
202
self.runbzr('branch a b')
204
file('goodbye', 'wt').write('quux')
205
self.runbzr(['commit', '-m', "more u's are always good"])
208
file('hello', 'wt').write('quuux')
209
# We can't merge when there are in-tree changes
210
self.runbzr('merge ../b', retcode=1)
211
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
212
self.runbzr('merge ../b')
213
self.check_file_contents('goodbye', 'quux')
214
# Merging a branch pulls its revision into the tree
217
a.get_revision_xml(b.last_patch())
218
self.log('pending merges: %s', a.pending_merges())
219
# assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
220
# % (a.pending_merges(), b.last_patch())
223
"""Pull changes from one branch to another."""
227
self.example_branch()
229
self.runbzr('branch a b')
231
self.runbzr('commit -m blah --unchanged')
235
assert a.revision_history() == b.revision_history()[:-1]
236
self.runbzr('pull ../b')
237
assert a.revision_history() == b.revision_history()
238
self.runbzr('commit -m blah2 --unchanged')
240
self.runbzr('commit -m blah3 --unchanged')
241
self.runbzr('pull ../a', retcode=1)
243
self.runbzr('merge ../b')
244
self.runbzr('commit -m blah4 --unchanged')
246
self.runbzr('pull ../a')
247
assert a.revision_history()[-1] == b.revision_history()[-1]
250
def test_add_reports(self):
251
"""add command prints the names of added files."""
252
b = Branch('.', init=True)
253
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
255
from cStringIO import StringIO
258
ret = self.apply_redirected(None, out, None,
261
self.assertEquals(ret, 0)
263
# the ordering is not defined at the moment
264
results = sorted(out.getvalue().rstrip('\n').split('\n'))
265
self.assertEquals(['added dir',
271
class OldTests(ExternalBase):
272
"""old tests moved from ./testbzr."""
275
from os import chdir, mkdir
276
from os.path import exists
279
backtick = self.backtick
282
progress("basic branch creation")
287
self.assertEquals(backtick('bzr root').rstrip(),
288
os.path.join(self.test_dir, 'branch1'))
290
progress("status of new file")
292
f = file('test.txt', 'wt')
293
f.write('hello world!\n')
296
out = backtick("bzr unknowns")
297
self.assertEquals(out, 'test.txt\n')
299
out = backtick("bzr status")
300
assert out == 'unknown:\n test.txt\n'
302
out = backtick("bzr status --all")
303
assert out == "unknown:\n test.txt\n"
305
out = backtick("bzr status test.txt --all")
306
assert out == "unknown:\n test.txt\n"
308
f = file('test2.txt', 'wt')
309
f.write('goodbye cruel world...\n')
312
out = backtick("bzr status test.txt")
313
assert out == "unknown:\n test.txt\n"
315
out = backtick("bzr status")
316
assert out == ("unknown:\n"
320
os.unlink('test2.txt')
322
progress("command aliases")
323
out = backtick("bzr st --all")
324
assert out == ("unknown:\n"
327
out = backtick("bzr stat")
328
assert out == ("unknown:\n"
331
progress("command help")
334
runbzr("help commands")
335
runbzr("help slartibartfast", 1)
337
out = backtick("bzr help ci")
338
out.index('aliases: ')
340
progress("can't rename unversioned file")
341
runbzr("rename test.txt new-test.txt", 1)
343
progress("adding a file")
345
runbzr("add test.txt")
346
assert backtick("bzr unknowns") == ''
347
assert backtick("bzr status --all") == ("added:\n"
350
progress("rename newly-added file")
351
runbzr("rename test.txt hello.txt")
352
assert os.path.exists("hello.txt")
353
assert not os.path.exists("test.txt")
355
assert backtick("bzr revno") == '0\n'
357
progress("add first revision")
358
runbzr(['commit', '-m', 'add first revision'])
360
progress("more complex renames")
362
runbzr("rename hello.txt sub1", 1)
363
runbzr("rename hello.txt sub1/hello.txt", 1)
364
runbzr("move hello.txt sub1", 1)
367
runbzr("rename sub1 sub2")
368
runbzr("move hello.txt sub2")
369
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
371
assert exists("sub2")
372
assert exists("sub2/hello.txt")
373
assert not exists("sub1")
374
assert not exists("hello.txt")
376
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
380
runbzr('move sub2/hello.txt sub1')
381
assert not exists('sub2/hello.txt')
382
assert exists('sub1/hello.txt')
383
runbzr('move sub2 sub1')
384
assert not exists('sub2')
385
assert exists('sub1/sub2')
387
runbzr(['commit', '-m', 'rename nested subdirectories'])
390
self.assertEquals(backtick('bzr root')[:-1],
391
os.path.join(self.test_dir, 'branch1'))
392
runbzr('move ../hello.txt .')
393
assert exists('./hello.txt')
394
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
395
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
396
runbzr(['commit', '-m', 'move to parent directory'])
398
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
400
runbzr('move sub2/hello.txt .')
401
assert exists('hello.txt')
403
f = file('hello.txt', 'wt')
404
f.write('some nice new content\n')
407
f = file('msg.tmp', 'wt')
408
f.write('this is my new commit\n')
411
runbzr('commit -F msg.tmp')
413
assert backtick('bzr revno') == '5\n'
414
runbzr('export -r 5 export-5.tmp')
415
runbzr('export export.tmp')
419
runbzr('log -v --forward')
420
runbzr('log -m', retcode=1)
421
log_out = backtick('bzr log -m commit')
422
assert "this is my new commit" in log_out
423
assert "rename nested" not in log_out
424
assert 'revision-id' not in log_out
425
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
428
progress("file with spaces in name")
429
mkdir('sub directory')
430
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
433
runbzr('commit -m add-spaces')
437
runbzr('log --forward')
added
removed
bzrlib/selftest/blackbox.py
