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
39
class ExternalBase(TestCaseInTempDir):
41
def runbzr(self, args, retcode=0, backtick=False):
42
if isinstance(args, basestring):
46
return self.run_bzr_captured(args, retcode=retcode)[0]
48
return self.run_bzr_captured(args, retcode=retcode)
51
class TestCommands(ExternalBase):
53
def test_help_commands(self):
56
self.runbzr('help commands')
57
self.runbzr('help help')
58
self.runbzr('commit -h')
60
def test_init_branch(self):
63
def test_whoami(self):
64
# this should always identify something, if only "john@localhost"
66
self.runbzr("whoami --email")
68
self.assertEquals(self.runbzr("whoami --email",
69
backtick=True).count('@'), 1)
71
def test_whoami_branch(self):
72
"""branch specific user identity works."""
74
f = file('.bzr/email', 'wt')
75
f.write('Branch Identity <branch@identi.ty>')
77
bzr_email = os.environ.get('BZREMAIL')
78
if bzr_email is not None:
79
del os.environ['BZREMAIL']
80
whoami = self.runbzr("whoami",backtick=True)
81
whoami_email = self.runbzr("whoami --email",backtick=True)
82
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
83
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
84
# Verify that the environment variable overrides the value
86
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
87
whoami = self.runbzr("whoami",backtick=True)
88
whoami_email = self.runbzr("whoami --email",backtick=True)
89
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
90
self.assertTrue(whoami_email.startswith('other@environ.ment'))
91
if bzr_email is not None:
92
os.environ['BZREMAIL'] = bzr_email
94
def test_invalid_commands(self):
95
self.runbzr("pants", retcode=1)
96
self.runbzr("--pants off", retcode=1)
97
self.runbzr("diff --message foo", retcode=1)
99
def test_empty_commit(self):
101
self.build_tree(['hello.txt'])
102
self.runbzr("commit -m empty", retcode=1)
103
self.runbzr("add hello.txt")
104
self.runbzr("commit -m added")
106
def test_ignore_patterns(self):
107
from bzrlib.branch import Branch
109
b = Branch.initialize('.')
110
self.assertEquals(list(b.unknowns()), [])
112
file('foo.tmp', 'wt').write('tmp files are ignored')
113
self.assertEquals(list(b.unknowns()), [])
114
assert self.capture('unknowns') == ''
116
file('foo.c', 'wt').write('int main() {}')
117
self.assertEquals(list(b.unknowns()), ['foo.c'])
118
assert self.capture('unknowns') == 'foo.c\n'
120
self.runbzr(['add', 'foo.c'])
121
assert self.capture('unknowns') == ''
123
# 'ignore' works when creating the .bzignore file
124
file('foo.blah', 'wt').write('blah')
125
self.assertEquals(list(b.unknowns()), ['foo.blah'])
126
self.runbzr('ignore *.blah')
127
self.assertEquals(list(b.unknowns()), [])
128
assert file('.bzrignore', 'rU').read() == '*.blah\n'
130
# 'ignore' works when then .bzrignore file already exists
131
file('garh', 'wt').write('garh')
132
self.assertEquals(list(b.unknowns()), ['garh'])
133
assert self.capture('unknowns') == 'garh\n'
134
self.runbzr('ignore garh')
135
self.assertEquals(list(b.unknowns()), [])
136
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
138
def test_revert(self):
141
file('hello', 'wt').write('foo')
142
self.runbzr('add hello')
143
self.runbzr('commit -m setup hello')
145
file('goodbye', 'wt').write('baz')
146
self.runbzr('add goodbye')
147
self.runbzr('commit -m setup goodbye')
149
file('hello', 'wt').write('bar')
150
file('goodbye', 'wt').write('qux')
151
self.runbzr('revert hello')
152
self.check_file_contents('hello', 'foo')
153
self.check_file_contents('goodbye', 'qux')
154
self.runbzr('revert')
155
self.check_file_contents('goodbye', 'baz')
157
os.mkdir('revertdir')
158
self.runbzr('add revertdir')
159
self.runbzr('commit -m f')
160
os.rmdir('revertdir')
161
self.runbzr('revert')
163
os.symlink('/unlikely/to/exist', 'symlink')
164
self.runbzr('add symlink')
165
self.runbzr('commit -m f')
167
self.runbzr('revert')
169
file('hello', 'wt').write('xyz')
170
self.runbzr('commit -m xyz hello')
171
self.runbzr('revert -r 1 hello')
172
self.check_file_contents('hello', 'foo')
173
self.runbzr('revert hello')
174
self.check_file_contents('hello', 'xyz')
175
os.chdir('revertdir')
176
self.runbzr('revert')
180
def test_mv_modes(self):
181
"""Test two modes of operation for mv"""
182
from bzrlib.branch import Branch
183
b = Branch.initialize('.')
184
self.build_tree(['a', 'c', 'subdir/'])
185
self.run_bzr_captured(['add', self.test_dir])
186
self.run_bzr_captured(['mv', 'a', 'b'])
187
self.run_bzr_captured(['mv', 'b', 'subdir'])
188
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
189
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
190
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
193
def test_main_version(self):
194
"""Check output from version command and master option is reasonable"""
195
# output is intentionally passed through to stdout so that we
196
# can see the version being tested
197
output = self.runbzr('version', backtick=1)
198
self.log('bzr version output:')
200
self.assert_(output.startswith('bzr (bazaar-ng) '))
201
self.assertNotEqual(output.index('Canonical'), -1)
202
# make sure --version is consistent
203
tmp_output = self.runbzr('--version', backtick=1)
204
self.log('bzr --version output:')
206
self.assertEquals(output, tmp_output)
208
def example_branch(test):
210
file('hello', 'wt').write('foo')
211
test.runbzr('add hello')
212
test.runbzr('commit -m setup hello')
213
file('goodbye', 'wt').write('baz')
214
test.runbzr('add goodbye')
215
test.runbzr('commit -m setup goodbye')
217
def test_export(self):
220
self.example_branch()
221
self.runbzr('export ../latest')
222
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
223
self.runbzr('export ../first -r 1')
224
assert not os.path.exists('../first/goodbye')
225
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
226
self.runbzr('export ../first.gz -r 1')
227
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
228
self.runbzr('export ../first.bz2 -r 1')
229
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
230
self.runbzr('export ../first.tar -r 1')
231
assert os.path.isfile('../first.tar')
232
from tarfile import TarFile
233
tf = TarFile('../first.tar')
234
assert 'first/hello' in tf.getnames(), tf.getnames()
235
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
236
self.runbzr('export ../first.tar.gz -r 1')
237
assert os.path.isfile('../first.tar.gz')
238
self.runbzr('export ../first.tbz2 -r 1')
239
assert os.path.isfile('../first.tbz2')
240
self.runbzr('export ../first.tar.bz2 -r 1')
241
assert os.path.isfile('../first.tar.bz2')
242
self.runbzr('export ../first.tar.tbz2 -r 1')
243
assert os.path.isfile('../first.tar.tbz2')
244
from bz2 import BZ2File
245
tf = TarFile('../first.tar.tbz2',
246
fileobj=BZ2File('../first.tar.tbz2', 'r'))
247
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
248
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
249
self.runbzr('export ../first2.tar -r 1 --root pizza')
250
tf = TarFile('../first2.tar')
251
assert 'pizza/hello' in tf.getnames(), tf.getnames()
254
self.example_branch()
255
file('hello', 'wt').write('hello world!')
256
self.runbzr('commit -m fixing hello')
257
output = self.runbzr('diff -r 2..3', backtick=1)
258
self.assert_('\n+hello world!' in output)
259
output = self.runbzr('diff -r last:3..last:1', backtick=1)
260
self.assert_('\n+baz' in output)
262
def test_branch(self):
263
"""Branch from one branch to another."""
266
self.example_branch()
268
self.runbzr('branch a b')
269
self.runbzr('branch a c -r 1')
271
self.runbzr('commit -m foo --unchanged')
273
# naughty - abstraction violations RBC 20050928
274
print "test_branch used to delete the stores, how is this meant to work ?"
275
#shutil.rmtree('a/.bzr/revision-store')
276
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
277
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
278
self.runbzr('branch a d --basis b')
280
def test_merge(self):
281
from bzrlib.branch import Branch
285
self.example_branch()
287
self.runbzr('branch a b')
289
file('goodbye', 'wt').write('quux')
290
self.runbzr(['commit', '-m', "more u's are always good"])
293
file('hello', 'wt').write('quuux')
294
# We can't merge when there are in-tree changes
295
self.runbzr('merge ../b', retcode=1)
296
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
297
self.runbzr('merge ../b')
298
self.check_file_contents('goodbye', 'quux')
299
# Merging a branch pulls its revision into the tree
301
b = Branch.open('../b')
302
a.get_revision_xml(b.last_revision())
303
self.log('pending merges: %s', a.pending_merges())
304
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
305
# % (a.pending_merges(), b.last_patch())
307
def test_merge_with_missing_file(self):
308
"""Merge handles missing file conflicts"""
312
print >> file('sub/a.txt', 'wb'), "hello"
313
print >> file('b.txt', 'wb'), "hello"
314
print >> file('sub/c.txt', 'wb'), "hello"
317
self.runbzr(('commit', '-m', 'added a'))
318
self.runbzr('branch . ../b')
319
print >> file('sub/a.txt', 'ab'), "there"
320
print >> file('b.txt', 'ab'), "there"
321
print >> file('sub/c.txt', 'ab'), "there"
322
self.runbzr(('commit', '-m', 'Added there'))
323
os.unlink('sub/a.txt')
324
os.unlink('sub/c.txt')
327
self.runbzr(('commit', '-m', 'Removed a.txt'))
329
print >> file('sub/a.txt', 'ab'), "something"
330
print >> file('b.txt', 'ab'), "something"
331
print >> file('sub/c.txt', 'ab'), "something"
332
self.runbzr(('commit', '-m', 'Modified a.txt'))
333
self.runbzr('merge ../a/')
334
assert os.path.exists('sub/a.txt.THIS')
335
assert os.path.exists('sub/a.txt.BASE')
337
self.runbzr('merge ../b/')
338
assert os.path.exists('sub/a.txt.OTHER')
339
assert os.path.exists('sub/a.txt.BASE')
341
def test_merge_with_missing_file(self):
342
"""Merge handles missing file conflicts"""
346
print >> file('sub/a.txt', 'wb'), "hello"
347
print >> file('b.txt', 'wb'), "hello"
348
print >> file('sub/c.txt', 'wb'), "hello"
351
self.runbzr(('commit', '-m', 'added a'))
352
self.runbzr('branch . ../b')
353
print >> file('sub/a.txt', 'ab'), "there"
354
print >> file('b.txt', 'ab'), "there"
355
print >> file('sub/c.txt', 'ab'), "there"
356
self.runbzr(('commit', '-m', 'Added there'))
357
os.unlink('sub/a.txt')
358
os.unlink('sub/c.txt')
361
self.runbzr(('commit', '-m', 'Removed a.txt'))
363
print >> file('sub/a.txt', 'ab'), "something"
364
print >> file('b.txt', 'ab'), "something"
365
print >> file('sub/c.txt', 'ab'), "something"
366
self.runbzr(('commit', '-m', 'Modified a.txt'))
367
self.runbzr('merge ../a/')
368
assert os.path.exists('sub/a.txt.THIS')
369
assert os.path.exists('sub/a.txt.BASE')
371
self.runbzr('merge ../b/')
372
assert os.path.exists('sub/a.txt.OTHER')
373
assert os.path.exists('sub/a.txt.BASE')
376
"""Pull changes from one branch to another."""
380
self.example_branch()
381
self.runbzr('pull', retcode=1)
382
self.runbzr('missing', retcode=1)
383
self.runbzr('missing .')
384
self.runbzr('missing')
386
self.runbzr('pull /', retcode=1)
390
self.runbzr('branch a b')
394
self.runbzr('add subdir')
395
self.runbzr('commit -m blah --unchanged')
398
b = Branch.open('../b')
399
assert a.revision_history() == b.revision_history()[:-1]
400
self.runbzr('pull ../b')
401
assert a.revision_history() == b.revision_history()
402
self.runbzr('commit -m blah2 --unchanged')
404
self.runbzr('commit -m blah3 --unchanged')
405
self.runbzr('pull ../a', retcode=1)
406
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
409
self.runbzr('merge ../b')
410
self.runbzr('commit -m blah4 --unchanged')
411
os.chdir('../b/subdir')
412
self.runbzr('pull ../../a')
413
assert a.revision_history()[-1] == b.revision_history()[-1]
414
self.runbzr('commit -m blah5 --unchanged')
415
self.runbzr('commit -m blah6 --unchanged')
417
self.runbzr('pull ../a')
419
self.runbzr('commit -m blah7 --unchanged')
420
self.runbzr('merge ../b')
421
self.runbzr('commit -m blah8 --unchanged')
422
self.runbzr('pull ../b')
423
self.runbzr('pull ../b')
425
def test_add_reports(self):
426
"""add command prints the names of added files."""
427
b = Branch.initialize('.')
428
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
429
out = self.run_bzr_captured(['add'], retcode = 0)[0]
430
# the ordering is not defined at the moment
431
results = sorted(out.rstrip('\n').split('\n'))
432
self.assertEquals(['added dir',
433
'added dir'+os.sep+'sub.txt',
437
def test_unknown_command(self):
438
"""Handling of unknown command."""
439
out, err = self.run_bzr_captured(['fluffy-badger'],
441
self.assertEquals(out, '')
442
err.index('unknown command')
447
if hasattr(os, 'symlink'):
452
def listdir_sorted(dir):
458
class OldTests(ExternalBase):
459
"""old tests moved from ./testbzr."""
462
from os import chdir, mkdir
463
from os.path import exists
466
capture = self.capture
469
progress("basic branch creation")
474
self.assertEquals(capture('root').rstrip(),
475
os.path.join(self.test_dir, 'branch1'))
477
progress("status of new file")
479
f = file('test.txt', 'wt')
480
f.write('hello world!\n')
483
self.assertEquals(capture('unknowns'), 'test.txt\n')
485
out = capture("status")
486
assert out == 'unknown:\n test.txt\n'
488
out = capture("status --all")
489
assert out == "unknown:\n test.txt\n"
491
out = capture("status test.txt --all")
492
assert out == "unknown:\n test.txt\n"
494
f = file('test2.txt', 'wt')
495
f.write('goodbye cruel world...\n')
498
out = capture("status test.txt")
499
assert out == "unknown:\n test.txt\n"
501
out = capture("status")
502
assert out == ("unknown:\n"
506
os.unlink('test2.txt')
508
progress("command aliases")
509
out = capture("st --all")
510
assert out == ("unknown:\n"
513
out = capture("stat")
514
assert out == ("unknown:\n"
517
progress("command help")
520
runbzr("help commands")
521
runbzr("help slartibartfast", 1)
523
out = capture("help ci")
524
out.index('aliases: ')
526
progress("can't rename unversioned file")
527
runbzr("rename test.txt new-test.txt", 1)
529
progress("adding a file")
531
runbzr("add test.txt")
532
assert capture("unknowns") == ''
533
assert capture("status --all") == ("added:\n"
536
progress("rename newly-added file")
537
runbzr("rename test.txt hello.txt")
538
assert os.path.exists("hello.txt")
539
assert not os.path.exists("test.txt")
541
assert capture("revno") == '0\n'
543
progress("add first revision")
544
runbzr(['commit', '-m', 'add first revision'])
546
progress("more complex renames")
548
runbzr("rename hello.txt sub1", 1)
549
runbzr("rename hello.txt sub1/hello.txt", 1)
550
runbzr("move hello.txt sub1", 1)
553
runbzr("rename sub1 sub2")
554
runbzr("move hello.txt sub2")
555
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
557
assert exists("sub2")
558
assert exists("sub2/hello.txt")
559
assert not exists("sub1")
560
assert not exists("hello.txt")
562
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
566
runbzr('move sub2/hello.txt sub1')
567
assert not exists('sub2/hello.txt')
568
assert exists('sub1/hello.txt')
569
runbzr('move sub2 sub1')
570
assert not exists('sub2')
571
assert exists('sub1/sub2')
573
runbzr(['commit', '-m', 'rename nested subdirectories'])
576
self.assertEquals(capture('root')[:-1],
577
os.path.join(self.test_dir, 'branch1'))
578
runbzr('move ../hello.txt .')
579
assert exists('./hello.txt')
580
self.assertEquals(capture('relpath hello.txt'),
581
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
582
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
583
runbzr(['commit', '-m', 'move to parent directory'])
585
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
587
runbzr('move sub2/hello.txt .')
588
assert exists('hello.txt')
590
f = file('hello.txt', 'wt')
591
f.write('some nice new content\n')
594
f = file('msg.tmp', 'wt')
595
f.write('this is my new commit\n')
598
runbzr('commit -F msg.tmp')
600
assert capture('revno') == '5\n'
601
runbzr('export -r 5 export-5.tmp')
602
runbzr('export export.tmp')
606
runbzr('log -v --forward')
607
runbzr('log -m', retcode=1)
608
log_out = capture('log -m commit')
609
assert "this is my new commit" in log_out
610
assert "rename nested" not in log_out
611
assert 'revision-id' not in log_out
612
assert 'revision-id' in capture('log --show-ids -m commit')
615
progress("file with spaces in name")
616
mkdir('sub directory')
617
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
620
runbzr('commit -m add-spaces')
624
runbzr('log --forward')
633
os.symlink("NOWHERE1", "link1")
635
assert self.capture('unknowns') == ''
636
runbzr(['commit', '-m', '1: added symlink link1'])
640
assert self.capture('unknowns') == ''
641
os.symlink("NOWHERE2", "d1/link2")
642
assert self.capture('unknowns') == 'd1/link2\n'
643
# is d1/link2 found when adding d1
645
assert self.capture('unknowns') == ''
646
os.symlink("NOWHERE3", "d1/link3")
647
assert self.capture('unknowns') == 'd1/link3\n'
648
runbzr(['commit', '-m', '2: added dir, symlink'])
650
runbzr('rename d1 d2')
651
runbzr('move d2/link2 .')
652
runbzr('move link1 d2')
653
assert os.readlink("./link2") == "NOWHERE2"
654
assert os.readlink("d2/link1") == "NOWHERE1"
655
runbzr('add d2/link3')
657
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
660
os.symlink("TARGET 2", "link2")
661
os.unlink("d2/link1")
662
os.symlink("TARGET 1", "d2/link1")
664
assert self.capture("relpath d2/link1") == "d2/link1\n"
665
runbzr(['commit', '-m', '4: retarget of two links'])
667
runbzr('remove d2/link1')
668
assert self.capture('unknowns') == 'd2/link1\n'
669
runbzr(['commit', '-m', '5: remove d2/link1'])
673
runbzr('rename d2/link3 d1/link3new')
674
assert self.capture('unknowns') == 'd2/link1\n'
675
runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
679
runbzr(['export', '-r', '1', 'exp1.tmp'])
681
assert listdir_sorted(".") == [ "link1" ]
682
assert os.readlink("link1") == "NOWHERE1"
685
runbzr(['export', '-r', '2', 'exp2.tmp'])
687
assert listdir_sorted(".") == [ "d1", "link1" ]
690
runbzr(['export', '-r', '3', 'exp3.tmp'])
692
assert listdir_sorted(".") == [ "d2", "link2" ]
693
assert listdir_sorted("d2") == [ "link1", "link3" ]
694
assert os.readlink("d2/link1") == "NOWHERE1"
695
assert os.readlink("link2") == "NOWHERE2"
698
runbzr(['export', '-r', '4', 'exp4.tmp'])
700
assert listdir_sorted(".") == [ "d2", "link2" ]
701
assert os.readlink("d2/link1") == "TARGET 1"
702
assert os.readlink("link2") == "TARGET 2"
703
assert listdir_sorted("d2") == [ "link1", "link3" ]
706
runbzr(['export', '-r', '5', 'exp5.tmp'])
708
assert listdir_sorted(".") == [ "d2", "link2" ]
709
assert os.path.islink("link2")
710
assert listdir_sorted("d2")== [ "link3" ]
713
runbzr(['export', '-r', '6', 'exp6.tmp'])
715
assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
716
assert listdir_sorted("d1") == [ "link3new" ]
717
assert listdir_sorted("d2") == []
718
assert os.readlink("d1/link3new") == "NOWHERE3"
721
progress("skipping symlink tests")
added
removed
bzrlib/selftest/blackbox.py
