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. This doesn't actually run a new interpreter but
23
rather starts again from the run_bzr function.
27
from cStringIO import StringIO
33
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
34
from bzrlib.branch import Branch
35
from bzrlib.osutils import has_symlinks
36
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
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'])
192
def test_main_version(self):
193
"""Check output from version command and master option is reasonable"""
194
# output is intentionally passed through to stdout so that we
195
# can see the version being tested
196
output = self.runbzr('version', backtick=1)
197
self.log('bzr version output:')
199
self.assert_(output.startswith('bzr (bazaar-ng) '))
200
self.assertNotEqual(output.index('Canonical'), -1)
201
# make sure --version is consistent
202
tmp_output = self.runbzr('--version', backtick=1)
203
self.log('bzr --version output:')
205
self.assertEquals(output, tmp_output)
207
def example_branch(test):
209
file('hello', 'wt').write('foo')
210
test.runbzr('add hello')
211
test.runbzr('commit -m setup hello')
212
file('goodbye', 'wt').write('baz')
213
test.runbzr('add goodbye')
214
test.runbzr('commit -m setup goodbye')
216
def test_export(self):
219
self.example_branch()
220
self.runbzr('export ../latest')
221
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
222
self.runbzr('export ../first -r 1')
223
assert not os.path.exists('../first/goodbye')
224
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
225
self.runbzr('export ../first.gz -r 1')
226
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
227
self.runbzr('export ../first.bz2 -r 1')
228
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
229
self.runbzr('export ../first.tar -r 1')
230
assert os.path.isfile('../first.tar')
231
from tarfile import TarFile
232
tf = TarFile('../first.tar')
233
assert 'first/hello' in tf.getnames(), tf.getnames()
234
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
235
self.runbzr('export ../first.tar.gz -r 1')
236
assert os.path.isfile('../first.tar.gz')
237
self.runbzr('export ../first.tbz2 -r 1')
238
assert os.path.isfile('../first.tbz2')
239
self.runbzr('export ../first.tar.bz2 -r 1')
240
assert os.path.isfile('../first.tar.bz2')
241
self.runbzr('export ../first.tar.tbz2 -r 1')
242
assert os.path.isfile('../first.tar.tbz2')
243
from bz2 import BZ2File
244
tf = TarFile('../first.tar.tbz2',
245
fileobj=BZ2File('../first.tar.tbz2', 'r'))
246
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
247
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
248
self.runbzr('export ../first2.tar -r 1 --root pizza')
249
tf = TarFile('../first2.tar')
250
assert 'pizza/hello' in tf.getnames(), tf.getnames()
253
self.example_branch()
254
file('hello', 'wt').write('hello world!')
255
self.runbzr('commit -m fixing hello')
256
output = self.runbzr('diff -r 2..3', backtick=1)
257
self.assert_('\n+hello world!' in output)
258
output = self.runbzr('diff -r last:3..last:1', backtick=1)
259
self.assert_('\n+baz' in output)
261
def test_branch(self):
262
"""Branch from one branch to another."""
265
self.example_branch()
267
self.runbzr('branch a b')
268
self.runbzr('branch a c -r 1')
270
self.runbzr('commit -m foo --unchanged')
272
# naughty - abstraction violations RBC 20050928
273
print "test_branch used to delete the stores, how is this meant to work ?"
274
#shutil.rmtree('a/.bzr/revision-store')
275
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
276
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
277
self.runbzr('branch a d --basis b')
279
def test_merge(self):
280
from bzrlib.branch import Branch
284
self.example_branch()
286
self.runbzr('branch a b')
288
file('goodbye', 'wt').write('quux')
289
self.runbzr(['commit', '-m', "more u's are always good"])
292
file('hello', 'wt').write('quuux')
293
# We can't merge when there are in-tree changes
294
self.runbzr('merge ../b', retcode=1)
295
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
296
self.runbzr('merge ../b')
297
self.check_file_contents('goodbye', 'quux')
298
# Merging a branch pulls its revision into the tree
300
b = Branch.open('../b')
301
a.get_revision_xml(b.last_revision())
302
self.log('pending merges: %s', a.pending_merges())
303
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
304
# % (a.pending_merges(), b.last_revision())
306
def test_merge_with_missing_file(self):
307
"""Merge handles missing file conflicts"""
311
print >> file('sub/a.txt', 'wb'), "hello"
312
print >> file('b.txt', 'wb'), "hello"
313
print >> file('sub/c.txt', 'wb'), "hello"
316
self.runbzr(('commit', '-m', 'added a'))
317
self.runbzr('branch . ../b')
318
print >> file('sub/a.txt', 'ab'), "there"
319
print >> file('b.txt', 'ab'), "there"
320
print >> file('sub/c.txt', 'ab'), "there"
321
self.runbzr(('commit', '-m', 'Added there'))
322
os.unlink('sub/a.txt')
323
os.unlink('sub/c.txt')
326
self.runbzr(('commit', '-m', 'Removed a.txt'))
328
print >> file('sub/a.txt', 'ab'), "something"
329
print >> file('b.txt', 'ab'), "something"
330
print >> file('sub/c.txt', 'ab'), "something"
331
self.runbzr(('commit', '-m', 'Modified a.txt'))
332
self.runbzr('merge ../a/')
333
assert os.path.exists('sub/a.txt.THIS')
334
assert os.path.exists('sub/a.txt.BASE')
336
self.runbzr('merge ../b/')
337
assert os.path.exists('sub/a.txt.OTHER')
338
assert os.path.exists('sub/a.txt.BASE')
341
"""Pull changes from one branch to another."""
345
self.example_branch()
346
self.runbzr('pull', retcode=1)
347
self.runbzr('missing', retcode=1)
348
self.runbzr('missing .')
349
self.runbzr('missing')
351
self.runbzr('pull /', retcode=1)
355
self.runbzr('branch a b')
359
self.runbzr('add subdir')
360
self.runbzr('commit -m blah --unchanged')
363
b = Branch.open('../b')
364
assert a.revision_history() == b.revision_history()[:-1]
365
self.runbzr('pull ../b')
366
assert a.revision_history() == b.revision_history()
367
self.runbzr('commit -m blah2 --unchanged')
369
self.runbzr('commit -m blah3 --unchanged')
370
self.runbzr('pull ../a', retcode=1)
371
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
374
self.runbzr('merge ../b')
375
self.runbzr('commit -m blah4 --unchanged')
376
os.chdir('../b/subdir')
377
self.runbzr('pull ../../a')
378
assert a.revision_history()[-1] == b.revision_history()[-1]
379
self.runbzr('commit -m blah5 --unchanged')
380
self.runbzr('commit -m blah6 --unchanged')
382
self.runbzr('pull ../a')
384
self.runbzr('commit -m blah7 --unchanged')
385
self.runbzr('merge ../b')
386
self.runbzr('commit -m blah8 --unchanged')
387
self.runbzr('pull ../b')
388
self.runbzr('pull ../b')
390
def test_add_reports(self):
391
"""add command prints the names of added files."""
392
b = Branch.initialize('.')
393
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
394
out = self.run_bzr_captured(['add'], retcode = 0)[0]
395
# the ordering is not defined at the moment
396
results = sorted(out.rstrip('\n').split('\n'))
397
self.assertEquals(['added dir',
398
'added dir'+os.sep+'sub.txt',
402
def test_unknown_command(self):
403
"""Handling of unknown command."""
404
out, err = self.run_bzr_captured(['fluffy-badger'],
406
self.assertEquals(out, '')
407
err.index('unknown command')
410
def listdir_sorted(dir):
416
class OldTests(ExternalBase):
417
"""old tests moved from ./testbzr."""
420
from os import chdir, mkdir
421
from os.path import exists
424
capture = self.capture
427
progress("basic branch creation")
432
self.assertEquals(capture('root').rstrip(),
433
os.path.join(self.test_dir, 'branch1'))
435
progress("status of new file")
437
f = file('test.txt', 'wt')
438
f.write('hello world!\n')
441
self.assertEquals(capture('unknowns'), 'test.txt\n')
443
out = capture("status")
444
assert out == 'unknown:\n test.txt\n'
446
out = capture("status --all")
447
assert out == "unknown:\n test.txt\n"
449
out = capture("status test.txt --all")
450
assert out == "unknown:\n test.txt\n"
452
f = file('test2.txt', 'wt')
453
f.write('goodbye cruel world...\n')
456
out = capture("status test.txt")
457
assert out == "unknown:\n test.txt\n"
459
out = capture("status")
460
assert out == ("unknown:\n"
464
os.unlink('test2.txt')
466
progress("command aliases")
467
out = capture("st --all")
468
assert out == ("unknown:\n"
471
out = capture("stat")
472
assert out == ("unknown:\n"
475
progress("command help")
478
runbzr("help commands")
479
runbzr("help slartibartfast", 1)
481
out = capture("help ci")
482
out.index('aliases: ')
484
progress("can't rename unversioned file")
485
runbzr("rename test.txt new-test.txt", 1)
487
progress("adding a file")
489
runbzr("add test.txt")
490
assert capture("unknowns") == ''
491
assert capture("status --all") == ("added:\n"
494
progress("rename newly-added file")
495
runbzr("rename test.txt hello.txt")
496
assert os.path.exists("hello.txt")
497
assert not os.path.exists("test.txt")
499
assert capture("revno") == '0\n'
501
progress("add first revision")
502
runbzr(['commit', '-m', 'add first revision'])
504
progress("more complex renames")
506
runbzr("rename hello.txt sub1", 1)
507
runbzr("rename hello.txt sub1/hello.txt", 1)
508
runbzr("move hello.txt sub1", 1)
511
runbzr("rename sub1 sub2")
512
runbzr("move hello.txt sub2")
513
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
515
assert exists("sub2")
516
assert exists("sub2/hello.txt")
517
assert not exists("sub1")
518
assert not exists("hello.txt")
520
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
524
runbzr('move sub2/hello.txt sub1')
525
assert not exists('sub2/hello.txt')
526
assert exists('sub1/hello.txt')
527
runbzr('move sub2 sub1')
528
assert not exists('sub2')
529
assert exists('sub1/sub2')
531
runbzr(['commit', '-m', 'rename nested subdirectories'])
534
self.assertEquals(capture('root')[:-1],
535
os.path.join(self.test_dir, 'branch1'))
536
runbzr('move ../hello.txt .')
537
assert exists('./hello.txt')
538
self.assertEquals(capture('relpath hello.txt'),
539
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
540
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
541
runbzr(['commit', '-m', 'move to parent directory'])
543
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
545
runbzr('move sub2/hello.txt .')
546
assert exists('hello.txt')
548
f = file('hello.txt', 'wt')
549
f.write('some nice new content\n')
552
f = file('msg.tmp', 'wt')
553
f.write('this is my new commit\n')
556
runbzr('commit -F msg.tmp')
558
assert capture('revno') == '5\n'
559
runbzr('export -r 5 export-5.tmp')
560
runbzr('export export.tmp')
564
runbzr('log -v --forward')
565
runbzr('log -m', retcode=1)
566
log_out = capture('log -m commit')
567
assert "this is my new commit" in log_out
568
assert "rename nested" not in log_out
569
assert 'revision-id' not in log_out
570
assert 'revision-id' in capture('log --show-ids -m commit')
573
progress("file with spaces in name")
574
mkdir('sub directory')
575
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
578
runbzr('commit -m add-spaces')
582
runbzr('log --forward')
591
os.symlink("NOWHERE1", "link1")
593
assert self.capture('unknowns') == ''
594
runbzr(['commit', '-m', '1: added symlink link1'])
598
assert self.capture('unknowns') == ''
599
os.symlink("NOWHERE2", "d1/link2")
600
assert self.capture('unknowns') == 'd1/link2\n'
601
# is d1/link2 found when adding d1
603
assert self.capture('unknowns') == ''
604
os.symlink("NOWHERE3", "d1/link3")
605
assert self.capture('unknowns') == 'd1/link3\n'
606
runbzr(['commit', '-m', '2: added dir, symlink'])
608
runbzr('rename d1 d2')
609
runbzr('move d2/link2 .')
610
runbzr('move link1 d2')
611
assert os.readlink("./link2") == "NOWHERE2"
612
assert os.readlink("d2/link1") == "NOWHERE1"
613
runbzr('add d2/link3')
615
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
618
os.symlink("TARGET 2", "link2")
619
os.unlink("d2/link1")
620
os.symlink("TARGET 1", "d2/link1")
622
assert self.capture("relpath d2/link1") == "d2/link1\n"
623
runbzr(['commit', '-m', '4: retarget of two links'])
625
runbzr('remove d2/link1')
626
assert self.capture('unknowns') == 'd2/link1\n'
627
runbzr(['commit', '-m', '5: remove d2/link1'])
631
runbzr('rename d2/link3 d1/link3new')
632
assert self.capture('unknowns') == 'd2/link1\n'
633
runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
637
runbzr(['export', '-r', '1', 'exp1.tmp'])
639
assert listdir_sorted(".") == [ "link1" ]
640
assert os.readlink("link1") == "NOWHERE1"
643
runbzr(['export', '-r', '2', 'exp2.tmp'])
645
assert listdir_sorted(".") == [ "d1", "link1" ]
648
runbzr(['export', '-r', '3', 'exp3.tmp'])
650
assert listdir_sorted(".") == [ "d2", "link2" ]
651
assert listdir_sorted("d2") == [ "link1", "link3" ]
652
assert os.readlink("d2/link1") == "NOWHERE1"
653
assert os.readlink("link2") == "NOWHERE2"
656
runbzr(['export', '-r', '4', 'exp4.tmp'])
658
assert listdir_sorted(".") == [ "d2", "link2" ]
659
assert os.readlink("d2/link1") == "TARGET 1"
660
assert os.readlink("link2") == "TARGET 2"
661
assert listdir_sorted("d2") == [ "link1", "link3" ]
664
runbzr(['export', '-r', '5', 'exp5.tmp'])
666
assert listdir_sorted(".") == [ "d2", "link2" ]
667
assert os.path.islink("link2")
668
assert listdir_sorted("d2")== [ "link3" ]
671
runbzr(['export', '-r', '6', 'exp6.tmp'])
673
assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
674
assert listdir_sorted("d1") == [ "link3new" ]
675
assert listdir_sorted("d2") == []
676
assert os.readlink("d1/link3new") == "NOWHERE3"
679
progress("skipping symlink tests")
682
class HttpTests(TestCaseWithWebserver):
683
"""Test bzr ui commands against remote branches."""
685
def test_branch(self):
687
branch = Branch.initialize('from')
688
branch.commit('empty commit for nonsense', allow_pointless=True)
689
url = self.get_remote_url('from')
690
self.run_bzr('branch', url, 'to')
691
branch = Branch.open('to')
692
self.assertEqual(1, len(branch.revision_history()))
added
removed
bzrlib/selftest/blackbox.py
