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.
29
from cStringIO import StringIO
35
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
36
from bzrlib.branch import Branch
37
from bzrlib.osutils import has_symlinks
40
class ExternalBase(TestCaseInTempDir):
42
def runbzr(self, args, retcode=0, backtick=False):
43
if isinstance(args, basestring):
47
return self.run_bzr_captured(args, retcode=retcode)[0]
49
return self.run_bzr_captured(args, retcode=retcode)
52
class TestCommands(ExternalBase):
54
def test_help_commands(self):
57
self.runbzr('help commands')
58
self.runbzr('help help')
59
self.runbzr('commit -h')
61
def test_init_branch(self):
64
def test_whoami(self):
65
# this should always identify something, if only "john@localhost"
67
self.runbzr("whoami --email")
69
self.assertEquals(self.runbzr("whoami --email",
70
backtick=True).count('@'), 1)
72
def test_whoami_branch(self):
73
"""branch specific user identity works."""
75
f = file('.bzr/email', 'wt')
76
f.write('Branch Identity <branch@identi.ty>')
78
bzr_email = os.environ.get('BZREMAIL')
79
if bzr_email is not None:
80
del os.environ['BZREMAIL']
81
whoami = self.runbzr("whoami",backtick=True)
82
whoami_email = self.runbzr("whoami --email",backtick=True)
83
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
84
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
85
# Verify that the environment variable overrides the value
87
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
88
whoami = self.runbzr("whoami",backtick=True)
89
whoami_email = self.runbzr("whoami --email",backtick=True)
90
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
91
self.assertTrue(whoami_email.startswith('other@environ.ment'))
92
if bzr_email is not None:
93
os.environ['BZREMAIL'] = bzr_email
95
def test_invalid_commands(self):
96
self.runbzr("pants", retcode=1)
97
self.runbzr("--pants off", retcode=1)
98
self.runbzr("diff --message foo", retcode=1)
100
def test_empty_commit(self):
102
self.build_tree(['hello.txt'])
103
self.runbzr("commit -m empty", retcode=1)
104
self.runbzr("add hello.txt")
105
self.runbzr("commit -m added")
107
def test_ignore_patterns(self):
108
from bzrlib.branch import Branch
110
b = Branch.initialize('.')
111
self.assertEquals(list(b.unknowns()), [])
113
file('foo.tmp', 'wt').write('tmp files are ignored')
114
self.assertEquals(list(b.unknowns()), [])
115
assert self.capture('unknowns') == ''
117
file('foo.c', 'wt').write('int main() {}')
118
self.assertEquals(list(b.unknowns()), ['foo.c'])
119
assert self.capture('unknowns') == 'foo.c\n'
121
self.runbzr(['add', 'foo.c'])
122
assert self.capture('unknowns') == ''
124
# 'ignore' works when creating the .bzignore file
125
file('foo.blah', 'wt').write('blah')
126
self.assertEquals(list(b.unknowns()), ['foo.blah'])
127
self.runbzr('ignore *.blah')
128
self.assertEquals(list(b.unknowns()), [])
129
assert file('.bzrignore', 'rU').read() == '*.blah\n'
131
# 'ignore' works when then .bzrignore file already exists
132
file('garh', 'wt').write('garh')
133
self.assertEquals(list(b.unknowns()), ['garh'])
134
assert self.capture('unknowns') == 'garh\n'
135
self.runbzr('ignore garh')
136
self.assertEquals(list(b.unknowns()), [])
137
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
139
def test_revert(self):
142
file('hello', 'wt').write('foo')
143
self.runbzr('add hello')
144
self.runbzr('commit -m setup hello')
146
file('goodbye', 'wt').write('baz')
147
self.runbzr('add goodbye')
148
self.runbzr('commit -m setup goodbye')
150
file('hello', 'wt').write('bar')
151
file('goodbye', 'wt').write('qux')
152
self.runbzr('revert hello')
153
self.check_file_contents('hello', 'foo')
154
self.check_file_contents('goodbye', 'qux')
155
self.runbzr('revert')
156
self.check_file_contents('goodbye', 'baz')
158
os.mkdir('revertdir')
159
self.runbzr('add revertdir')
160
self.runbzr('commit -m f')
161
os.rmdir('revertdir')
162
self.runbzr('revert')
164
os.symlink('/unlikely/to/exist', 'symlink')
165
self.runbzr('add symlink')
166
self.runbzr('commit -m f')
168
self.runbzr('revert')
170
file('hello', 'wt').write('xyz')
171
self.runbzr('commit -m xyz hello')
172
self.runbzr('revert -r 1 hello')
173
self.check_file_contents('hello', 'foo')
174
self.runbzr('revert hello')
175
self.check_file_contents('hello', 'xyz')
176
os.chdir('revertdir')
177
self.runbzr('revert')
181
def test_mv_modes(self):
182
"""Test two modes of operation for mv"""
183
from bzrlib.branch import Branch
184
b = Branch.initialize('.')
185
self.build_tree(['a', 'c', 'subdir/'])
186
self.run_bzr_captured(['add', self.test_dir])
187
self.run_bzr_captured(['mv', 'a', 'b'])
188
self.run_bzr_captured(['mv', 'b', 'subdir'])
189
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
190
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
191
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
194
def test_main_version(self):
195
"""Check output from version command and master option is reasonable"""
196
# output is intentionally passed through to stdout so that we
197
# can see the version being tested
198
output = self.runbzr('version', backtick=1)
199
self.log('bzr version output:')
201
self.assert_(output.startswith('bzr (bazaar-ng) '))
202
self.assertNotEqual(output.index('Canonical'), -1)
203
# make sure --version is consistent
204
tmp_output = self.runbzr('--version', backtick=1)
205
self.log('bzr --version output:')
207
self.assertEquals(output, tmp_output)
209
def example_branch(test):
211
file('hello', 'wt').write('foo')
212
test.runbzr('add hello')
213
test.runbzr('commit -m setup hello')
214
file('goodbye', 'wt').write('baz')
215
test.runbzr('add goodbye')
216
test.runbzr('commit -m setup goodbye')
218
def test_export(self):
221
self.example_branch()
222
self.runbzr('export ../latest')
223
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
224
self.runbzr('export ../first -r 1')
225
assert not os.path.exists('../first/goodbye')
226
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
227
self.runbzr('export ../first.gz -r 1')
228
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
229
self.runbzr('export ../first.bz2 -r 1')
230
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
231
self.runbzr('export ../first.tar -r 1')
232
assert os.path.isfile('../first.tar')
233
from tarfile import TarFile
234
tf = TarFile('../first.tar')
235
assert 'first/hello' in tf.getnames(), tf.getnames()
236
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
237
self.runbzr('export ../first.tar.gz -r 1')
238
assert os.path.isfile('../first.tar.gz')
239
self.runbzr('export ../first.tbz2 -r 1')
240
assert os.path.isfile('../first.tbz2')
241
self.runbzr('export ../first.tar.bz2 -r 1')
242
assert os.path.isfile('../first.tar.bz2')
243
self.runbzr('export ../first.tar.tbz2 -r 1')
244
assert os.path.isfile('../first.tar.tbz2')
245
from bz2 import BZ2File
246
tf = TarFile('../first.tar.tbz2',
247
fileobj=BZ2File('../first.tar.tbz2', 'r'))
248
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
249
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
250
self.runbzr('export ../first2.tar -r 1 --root pizza')
251
tf = TarFile('../first2.tar')
252
assert 'pizza/hello' in tf.getnames(), tf.getnames()
255
self.example_branch()
256
file('hello', 'wt').write('hello world!')
257
self.runbzr('commit -m fixing hello')
258
output = self.runbzr('diff -r 2..3', backtick=1)
259
self.assert_('\n+hello world!' in output)
260
output = self.runbzr('diff -r last:3..last:1', backtick=1)
261
self.assert_('\n+baz' in output)
263
def test_branch(self):
264
"""Branch from one branch to another."""
267
self.example_branch()
269
self.runbzr('branch a b')
270
self.runbzr('branch a c -r 1')
272
self.runbzr('commit -m foo --unchanged')
274
# naughty - abstraction violations RBC 20050928
275
print "test_branch used to delete the stores, how is this meant to work ?"
276
#shutil.rmtree('a/.bzr/revision-store')
277
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
278
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
279
self.runbzr('branch a d --basis b')
281
def test_merge(self):
282
from bzrlib.branch import Branch
286
self.example_branch()
288
self.runbzr('branch a b')
290
file('goodbye', 'wt').write('quux')
291
self.runbzr(['commit', '-m', "more u's are always good"])
294
file('hello', 'wt').write('quuux')
295
# We can't merge when there are in-tree changes
296
self.runbzr('merge ../b', retcode=1)
297
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
298
self.runbzr('merge ../b')
299
self.check_file_contents('goodbye', 'quux')
300
# Merging a branch pulls its revision into the tree
302
b = Branch.open('../b')
303
a.get_revision_xml(b.last_revision())
304
self.log('pending merges: %s', a.pending_merges())
305
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
306
# % (a.pending_merges(), b.last_revision())
308
def test_merge_with_missing_file(self):
309
"""Merge handles missing file conflicts"""
313
print >> file('sub/a.txt', 'wb'), "hello"
314
print >> file('b.txt', 'wb'), "hello"
315
print >> file('sub/c.txt', 'wb'), "hello"
318
self.runbzr(('commit', '-m', 'added a'))
319
self.runbzr('branch . ../b')
320
print >> file('sub/a.txt', 'ab'), "there"
321
print >> file('b.txt', 'ab'), "there"
322
print >> file('sub/c.txt', 'ab'), "there"
323
self.runbzr(('commit', '-m', 'Added there'))
324
os.unlink('sub/a.txt')
325
os.unlink('sub/c.txt')
328
self.runbzr(('commit', '-m', 'Removed a.txt'))
330
print >> file('sub/a.txt', 'ab'), "something"
331
print >> file('b.txt', 'ab'), "something"
332
print >> file('sub/c.txt', 'ab'), "something"
333
self.runbzr(('commit', '-m', 'Modified a.txt'))
334
self.runbzr('merge ../a/')
335
assert os.path.exists('sub/a.txt.THIS')
336
assert os.path.exists('sub/a.txt.BASE')
338
self.runbzr('merge ../b/')
339
assert os.path.exists('sub/a.txt.OTHER')
340
assert os.path.exists('sub/a.txt.BASE')
343
"""Pull changes from one branch to another."""
347
self.example_branch()
348
self.runbzr('pull', retcode=1)
349
self.runbzr('missing', retcode=1)
350
self.runbzr('missing .')
351
self.runbzr('missing')
353
self.runbzr('pull /', retcode=1)
357
self.runbzr('branch a b')
361
self.runbzr('add subdir')
362
self.runbzr('commit -m blah --unchanged')
365
b = Branch.open('../b')
366
assert a.revision_history() == b.revision_history()[:-1]
367
self.runbzr('pull ../b')
368
assert a.revision_history() == b.revision_history()
369
self.runbzr('commit -m blah2 --unchanged')
371
self.runbzr('commit -m blah3 --unchanged')
372
self.runbzr('pull ../a', retcode=1)
373
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
376
self.runbzr('merge ../b')
377
self.runbzr('commit -m blah4 --unchanged')
378
os.chdir('../b/subdir')
379
self.runbzr('pull ../../a')
380
assert a.revision_history()[-1] == b.revision_history()[-1]
381
self.runbzr('commit -m blah5 --unchanged')
382
self.runbzr('commit -m blah6 --unchanged')
384
self.runbzr('pull ../a')
386
self.runbzr('commit -m blah7 --unchanged')
387
self.runbzr('merge ../b')
388
self.runbzr('commit -m blah8 --unchanged')
389
self.runbzr('pull ../b')
390
self.runbzr('pull ../b')
392
def test_add_reports(self):
393
"""add command prints the names of added files."""
394
b = Branch.initialize('.')
395
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
396
out = self.run_bzr_captured(['add'], retcode = 0)[0]
397
# the ordering is not defined at the moment
398
results = sorted(out.rstrip('\n').split('\n'))
399
self.assertEquals(['added dir',
400
'added dir'+os.sep+'sub.txt',
404
def test_unknown_command(self):
405
"""Handling of unknown command."""
406
out, err = self.run_bzr_captured(['fluffy-badger'],
408
self.assertEquals(out, '')
409
err.index('unknown command')
412
def listdir_sorted(dir):
418
class OldTests(ExternalBase):
419
"""old tests moved from ./testbzr."""
422
from os import chdir, mkdir
423
from os.path import exists
426
capture = self.capture
429
progress("basic branch creation")
434
self.assertEquals(capture('root').rstrip(),
435
os.path.join(self.test_dir, 'branch1'))
437
progress("status of new file")
439
f = file('test.txt', 'wt')
440
f.write('hello world!\n')
443
self.assertEquals(capture('unknowns'), 'test.txt\n')
445
out = capture("status")
446
assert out == 'unknown:\n test.txt\n'
448
out = capture("status --all")
449
assert out == "unknown:\n test.txt\n"
451
out = capture("status test.txt --all")
452
assert out == "unknown:\n test.txt\n"
454
f = file('test2.txt', 'wt')
455
f.write('goodbye cruel world...\n')
458
out = capture("status test.txt")
459
assert out == "unknown:\n test.txt\n"
461
out = capture("status")
462
assert out == ("unknown:\n"
466
os.unlink('test2.txt')
468
progress("command aliases")
469
out = capture("st --all")
470
assert out == ("unknown:\n"
473
out = capture("stat")
474
assert out == ("unknown:\n"
477
progress("command help")
480
runbzr("help commands")
481
runbzr("help slartibartfast", 1)
483
out = capture("help ci")
484
out.index('aliases: ')
486
progress("can't rename unversioned file")
487
runbzr("rename test.txt new-test.txt", 1)
489
progress("adding a file")
491
runbzr("add test.txt")
492
assert capture("unknowns") == ''
493
assert capture("status --all") == ("added:\n"
496
progress("rename newly-added file")
497
runbzr("rename test.txt hello.txt")
498
assert os.path.exists("hello.txt")
499
assert not os.path.exists("test.txt")
501
assert capture("revno") == '0\n'
503
progress("add first revision")
504
runbzr(['commit', '-m', 'add first revision'])
506
progress("more complex renames")
508
runbzr("rename hello.txt sub1", 1)
509
runbzr("rename hello.txt sub1/hello.txt", 1)
510
runbzr("move hello.txt sub1", 1)
513
runbzr("rename sub1 sub2")
514
runbzr("move hello.txt sub2")
515
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
517
assert exists("sub2")
518
assert exists("sub2/hello.txt")
519
assert not exists("sub1")
520
assert not exists("hello.txt")
522
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
526
runbzr('move sub2/hello.txt sub1')
527
assert not exists('sub2/hello.txt')
528
assert exists('sub1/hello.txt')
529
runbzr('move sub2 sub1')
530
assert not exists('sub2')
531
assert exists('sub1/sub2')
533
runbzr(['commit', '-m', 'rename nested subdirectories'])
536
self.assertEquals(capture('root')[:-1],
537
os.path.join(self.test_dir, 'branch1'))
538
runbzr('move ../hello.txt .')
539
assert exists('./hello.txt')
540
self.assertEquals(capture('relpath hello.txt'),
541
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
542
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
543
runbzr(['commit', '-m', 'move to parent directory'])
545
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
547
runbzr('move sub2/hello.txt .')
548
assert exists('hello.txt')
550
f = file('hello.txt', 'wt')
551
f.write('some nice new content\n')
554
f = file('msg.tmp', 'wt')
555
f.write('this is my new commit\n')
558
runbzr('commit -F msg.tmp')
560
assert capture('revno') == '5\n'
561
runbzr('export -r 5 export-5.tmp')
562
runbzr('export export.tmp')
566
runbzr('log -v --forward')
567
runbzr('log -m', retcode=1)
568
log_out = capture('log -m commit')
569
assert "this is my new commit" in log_out
570
assert "rename nested" not in log_out
571
assert 'revision-id' not in log_out
572
assert 'revision-id' in capture('log --show-ids -m commit')
575
progress("file with spaces in name")
576
mkdir('sub directory')
577
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
580
runbzr('commit -m add-spaces')
584
runbzr('log --forward')
593
os.symlink("NOWHERE1", "link1")
595
assert self.capture('unknowns') == ''
596
runbzr(['commit', '-m', '1: added symlink link1'])
600
assert self.capture('unknowns') == ''
601
os.symlink("NOWHERE2", "d1/link2")
602
assert self.capture('unknowns') == 'd1/link2\n'
603
# is d1/link2 found when adding d1
605
assert self.capture('unknowns') == ''
606
os.symlink("NOWHERE3", "d1/link3")
607
assert self.capture('unknowns') == 'd1/link3\n'
608
runbzr(['commit', '-m', '2: added dir, symlink'])
610
runbzr('rename d1 d2')
611
runbzr('move d2/link2 .')
612
runbzr('move link1 d2')
613
assert os.readlink("./link2") == "NOWHERE2"
614
assert os.readlink("d2/link1") == "NOWHERE1"
615
runbzr('add d2/link3')
617
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
620
os.symlink("TARGET 2", "link2")
621
os.unlink("d2/link1")
622
os.symlink("TARGET 1", "d2/link1")
624
assert self.capture("relpath d2/link1") == "d2/link1\n"
625
runbzr(['commit', '-m', '4: retarget of two links'])
627
runbzr('remove d2/link1')
628
assert self.capture('unknowns') == 'd2/link1\n'
629
runbzr(['commit', '-m', '5: remove d2/link1'])
633
runbzr('rename d2/link3 d1/link3new')
634
assert self.capture('unknowns') == 'd2/link1\n'
635
runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
639
runbzr(['export', '-r', '1', 'exp1.tmp'])
641
assert listdir_sorted(".") == [ "link1" ]
642
assert os.readlink("link1") == "NOWHERE1"
645
runbzr(['export', '-r', '2', 'exp2.tmp'])
647
assert listdir_sorted(".") == [ "d1", "link1" ]
650
runbzr(['export', '-r', '3', 'exp3.tmp'])
652
assert listdir_sorted(".") == [ "d2", "link2" ]
653
assert listdir_sorted("d2") == [ "link1", "link3" ]
654
assert os.readlink("d2/link1") == "NOWHERE1"
655
assert os.readlink("link2") == "NOWHERE2"
658
runbzr(['export', '-r', '4', 'exp4.tmp'])
660
assert listdir_sorted(".") == [ "d2", "link2" ]
661
assert os.readlink("d2/link1") == "TARGET 1"
662
assert os.readlink("link2") == "TARGET 2"
663
assert listdir_sorted("d2") == [ "link1", "link3" ]
666
runbzr(['export', '-r', '5', 'exp5.tmp'])
668
assert listdir_sorted(".") == [ "d2", "link2" ]
669
assert os.path.islink("link2")
670
assert listdir_sorted("d2")== [ "link3" ]
673
runbzr(['export', '-r', '6', 'exp6.tmp'])
675
assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
676
assert listdir_sorted("d1") == [ "link3new" ]
677
assert listdir_sorted("d2") == []
678
assert os.readlink("d1/link3new") == "NOWHERE3"
681
progress("skipping symlink tests")
added
removed
bzrlib/selftest/blackbox.py
