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.branch import Branch
34
from bzrlib.clone import copy_branch
35
from bzrlib.errors import BzrCommandError
36
from bzrlib.osutils import has_symlinks
37
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
38
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
41
class ExternalBase(TestCaseInTempDir):
43
def runbzr(self, args, retcode=0, backtick=False):
44
if isinstance(args, basestring):
48
return self.run_bzr_captured(args, retcode=retcode)[0]
50
return self.run_bzr_captured(args, retcode=retcode)
53
class TestCommands(ExternalBase):
55
def test_help_commands(self):
58
self.runbzr('help commands')
59
self.runbzr('help help')
60
self.runbzr('commit -h')
62
def test_init_branch(self):
65
def test_whoami(self):
66
# this should always identify something, if only "john@localhost"
68
self.runbzr("whoami --email")
70
self.assertEquals(self.runbzr("whoami --email",
71
backtick=True).count('@'), 1)
73
def test_whoami_branch(self):
74
"""branch specific user identity works."""
76
f = file('.bzr/email', 'wt')
77
f.write('Branch Identity <branch@identi.ty>')
79
bzr_email = os.environ.get('BZREMAIL')
80
if bzr_email is not None:
81
del os.environ['BZREMAIL']
82
whoami = self.runbzr("whoami",backtick=True)
83
whoami_email = self.runbzr("whoami --email",backtick=True)
84
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
85
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
86
# Verify that the environment variable overrides the value
88
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
89
whoami = self.runbzr("whoami",backtick=True)
90
whoami_email = self.runbzr("whoami --email",backtick=True)
91
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
92
self.assertTrue(whoami_email.startswith('other@environ.ment'))
93
if bzr_email is not None:
94
os.environ['BZREMAIL'] = bzr_email
96
def test_invalid_commands(self):
97
self.runbzr("pants", retcode=1)
98
self.runbzr("--pants off", retcode=1)
99
self.runbzr("diff --message foo", retcode=1)
101
def test_empty_commit(self):
103
self.build_tree(['hello.txt'])
104
self.runbzr("commit -m empty", retcode=1)
105
self.runbzr("add hello.txt")
106
self.runbzr("commit -m added")
108
def test_empty_commit_message(self):
110
file('foo.c', 'wt').write('int main() {}')
111
self.runbzr(['add', 'foo.c'])
112
self.runbzr(["commit", "-m", ""] , retcode=1)
114
def test_ignore_patterns(self):
115
from bzrlib.branch import Branch
117
b = Branch.initialize('.')
118
self.assertEquals(list(b.unknowns()), [])
120
file('foo.tmp', 'wt').write('tmp files are ignored')
121
self.assertEquals(list(b.unknowns()), [])
122
assert self.capture('unknowns') == ''
124
file('foo.c', 'wt').write('int main() {}')
125
self.assertEquals(list(b.unknowns()), ['foo.c'])
126
assert self.capture('unknowns') == 'foo.c\n'
128
self.runbzr(['add', 'foo.c'])
129
assert self.capture('unknowns') == ''
131
# 'ignore' works when creating the .bzignore file
132
file('foo.blah', 'wt').write('blah')
133
self.assertEquals(list(b.unknowns()), ['foo.blah'])
134
self.runbzr('ignore *.blah')
135
self.assertEquals(list(b.unknowns()), [])
136
assert file('.bzrignore', 'rU').read() == '*.blah\n'
138
# 'ignore' works when then .bzrignore file already exists
139
file('garh', 'wt').write('garh')
140
self.assertEquals(list(b.unknowns()), ['garh'])
141
assert self.capture('unknowns') == 'garh\n'
142
self.runbzr('ignore garh')
143
self.assertEquals(list(b.unknowns()), [])
144
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
146
def test_revert(self):
149
file('hello', 'wt').write('foo')
150
self.runbzr('add hello')
151
self.runbzr('commit -m setup hello')
153
file('goodbye', 'wt').write('baz')
154
self.runbzr('add goodbye')
155
self.runbzr('commit -m setup goodbye')
157
file('hello', 'wt').write('bar')
158
file('goodbye', 'wt').write('qux')
159
self.runbzr('revert hello')
160
self.check_file_contents('hello', 'foo')
161
self.check_file_contents('goodbye', 'qux')
162
self.runbzr('revert')
163
self.check_file_contents('goodbye', 'baz')
165
os.mkdir('revertdir')
166
self.runbzr('add revertdir')
167
self.runbzr('commit -m f')
168
os.rmdir('revertdir')
169
self.runbzr('revert')
171
os.symlink('/unlikely/to/exist', 'symlink')
172
self.runbzr('add symlink')
173
self.runbzr('commit -m f')
175
self.runbzr('revert')
176
self.failUnlessExists('symlink')
178
os.symlink('a-different-path', 'symlink')
179
self.runbzr('revert')
180
self.assertEqual('/unlikely/to/exist',
181
os.readlink('symlink'))
183
file('hello', 'wt').write('xyz')
184
self.runbzr('commit -m xyz hello')
185
self.runbzr('revert -r 1 hello')
186
self.check_file_contents('hello', 'foo')
187
self.runbzr('revert hello')
188
self.check_file_contents('hello', 'xyz')
189
os.chdir('revertdir')
190
self.runbzr('revert')
194
def test_mv_modes(self):
195
"""Test two modes of operation for mv"""
196
from bzrlib.branch import Branch
197
b = Branch.initialize('.')
198
self.build_tree(['a', 'c', 'subdir/'])
199
self.run_bzr_captured(['add', self.test_dir])
200
self.run_bzr_captured(['mv', 'a', 'b'])
201
self.run_bzr_captured(['mv', 'b', 'subdir'])
202
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
203
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
204
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
206
def test_main_version(self):
207
"""Check output from version command and master option is reasonable"""
208
# output is intentionally passed through to stdout so that we
209
# can see the version being tested
210
output = self.runbzr('version', backtick=1)
211
self.log('bzr version output:')
213
self.assert_(output.startswith('bzr (bazaar-ng) '))
214
self.assertNotEqual(output.index('Canonical'), -1)
215
# make sure --version is consistent
216
tmp_output = self.runbzr('--version', backtick=1)
217
self.log('bzr --version output:')
219
self.assertEquals(output, tmp_output)
221
def example_branch(test):
223
file('hello', 'wt').write('foo')
224
test.runbzr('add hello')
225
test.runbzr('commit -m setup hello')
226
file('goodbye', 'wt').write('baz')
227
test.runbzr('add goodbye')
228
test.runbzr('commit -m setup goodbye')
230
def test_export(self):
233
self.example_branch()
234
self.runbzr('export ../latest')
235
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
236
self.runbzr('export ../first -r 1')
237
assert not os.path.exists('../first/goodbye')
238
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
239
self.runbzr('export ../first.gz -r 1')
240
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
241
self.runbzr('export ../first.bz2 -r 1')
242
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
243
self.runbzr('export ../first.tar -r 1')
244
assert os.path.isfile('../first.tar')
245
from tarfile import TarFile
246
tf = TarFile('../first.tar')
247
assert 'first/hello' in tf.getnames(), tf.getnames()
248
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
249
self.runbzr('export ../first.tar.gz -r 1')
250
assert os.path.isfile('../first.tar.gz')
251
self.runbzr('export ../first.tbz2 -r 1')
252
assert os.path.isfile('../first.tbz2')
253
self.runbzr('export ../first.tar.bz2 -r 1')
254
assert os.path.isfile('../first.tar.bz2')
255
self.runbzr('export ../first.tar.tbz2 -r 1')
256
assert os.path.isfile('../first.tar.tbz2')
257
from bz2 import BZ2File
258
tf = TarFile('../first.tar.tbz2',
259
fileobj=BZ2File('../first.tar.tbz2', 'r'))
260
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
261
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
262
self.runbzr('export ../first2.tar -r 1 --root pizza')
263
tf = TarFile('../first2.tar')
264
assert 'pizza/hello' in tf.getnames(), tf.getnames()
267
self.example_branch()
268
file('hello', 'wt').write('hello world!')
269
self.runbzr('commit -m fixing hello')
270
output = self.runbzr('diff -r 2..3', backtick=1)
271
self.assert_('\n+hello world!' in output)
272
output = self.runbzr('diff -r last:3..last:1', backtick=1)
273
self.assert_('\n+baz' in output)
275
def test_diff_branches(self):
276
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
277
branch = Branch.initialize('branch1')
279
branch.commit('add file')
280
copy_branch(branch, 'branch2')
281
print >> open('branch2/file', 'w'), 'new content'
282
branch2 = Branch.open('branch2')
283
branch2.commit('update file')
284
# should open branch1 and diff against branch2,
285
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
286
self.assertEquals(("=== modified file 'file'\n"
291
"+contents of branch1/file\n"
294
def test_branch(self):
295
"""Branch from one branch to another."""
298
self.example_branch()
300
self.runbzr('branch a b')
301
self.runbzr('branch a c -r 1')
303
self.runbzr('commit -m foo --unchanged')
305
# naughty - abstraction violations RBC 20050928
306
print "test_branch used to delete the stores, how is this meant to work ?"
307
#shutil.rmtree('a/.bzr/revision-store')
308
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
309
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
310
self.runbzr('branch a d --basis b')
312
def test_merge(self):
313
from bzrlib.branch import Branch
317
self.example_branch()
319
self.runbzr('branch a b')
321
file('goodbye', 'wt').write('quux')
322
self.runbzr(['commit', '-m', "more u's are always good"])
325
file('hello', 'wt').write('quuux')
326
# We can't merge when there are in-tree changes
327
self.runbzr('merge ../b', retcode=1)
328
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
329
self.runbzr('merge ../b')
330
self.check_file_contents('goodbye', 'quux')
331
# Merging a branch pulls its revision into the tree
333
b = Branch.open('../b')
334
a.get_revision_xml(b.last_revision())
335
self.log('pending merges: %s', a.pending_merges())
336
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
337
# % (a.pending_merges(), b.last_patch())
339
def test_merge_with_missing_file(self):
340
"""Merge handles missing file conflicts"""
344
print >> file('sub/a.txt', 'wb'), "hello"
345
print >> file('b.txt', 'wb'), "hello"
346
print >> file('sub/c.txt', 'wb'), "hello"
349
self.runbzr(('commit', '-m', 'added a'))
350
self.runbzr('branch . ../b')
351
print >> file('sub/a.txt', 'ab'), "there"
352
print >> file('b.txt', 'ab'), "there"
353
print >> file('sub/c.txt', 'ab'), "there"
354
self.runbzr(('commit', '-m', 'Added there'))
355
os.unlink('sub/a.txt')
356
os.unlink('sub/c.txt')
359
self.runbzr(('commit', '-m', 'Removed a.txt'))
361
print >> file('sub/a.txt', 'ab'), "something"
362
print >> file('b.txt', 'ab'), "something"
363
print >> file('sub/c.txt', 'ab'), "something"
364
self.runbzr(('commit', '-m', 'Modified a.txt'))
365
self.runbzr('merge ../a/')
366
assert os.path.exists('sub/a.txt.THIS')
367
assert os.path.exists('sub/a.txt.BASE')
369
self.runbzr('merge ../b/')
370
assert os.path.exists('sub/a.txt.OTHER')
371
assert os.path.exists('sub/a.txt.BASE')
374
"""Pull changes from one branch to another."""
378
self.example_branch()
379
self.runbzr('pull', retcode=1)
380
self.runbzr('missing', retcode=1)
381
self.runbzr('missing .')
382
self.runbzr('missing')
384
self.runbzr('pull /', retcode=1)
388
self.runbzr('branch a b')
392
self.runbzr('add subdir')
393
self.runbzr('commit -m blah --unchanged')
396
b = Branch.open('../b')
397
assert a.revision_history() == b.revision_history()[:-1]
398
self.runbzr('pull ../b')
399
assert a.revision_history() == b.revision_history()
400
self.runbzr('commit -m blah2 --unchanged')
402
self.runbzr('commit -m blah3 --unchanged')
403
self.runbzr('pull ../a', retcode=1)
405
self.runbzr('merge ../b')
406
self.runbzr('commit -m blah4 --unchanged')
407
os.chdir('../b/subdir')
408
self.runbzr('pull ../../a')
409
assert a.revision_history()[-1] == b.revision_history()[-1]
410
self.runbzr('commit -m blah5 --unchanged')
411
self.runbzr('commit -m blah6 --unchanged')
413
self.runbzr('pull ../a')
415
self.runbzr('commit -m blah7 --unchanged')
416
self.runbzr('merge ../b')
417
self.runbzr('commit -m blah8 --unchanged')
418
self.runbzr('pull ../b')
419
self.runbzr('pull ../b')
421
def test_locations(self):
422
"""Using and remembering different locations"""
426
self.runbzr('commit -m unchanged --unchanged')
427
self.runbzr('pull', retcode=1)
428
self.runbzr('merge', retcode=1)
429
self.runbzr('branch . ../b')
432
self.runbzr('branch . ../c')
433
self.runbzr('pull ../c')
436
self.runbzr('pull ../b')
438
self.runbzr('pull ../c')
439
self.runbzr('branch ../c ../d')
440
shutil.rmtree('../c')
445
self.runbzr('pull', retcode=1)
446
self.runbzr('pull ../a --remember')
449
def test_add_reports(self):
450
"""add command prints the names of added files."""
451
b = Branch.initialize('.')
452
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
453
out = self.run_bzr_captured(['add'], retcode = 0)[0]
454
# the ordering is not defined at the moment
455
results = sorted(out.rstrip('\n').split('\n'))
456
self.assertEquals(['added dir',
457
'added dir'+os.sep+'sub.txt',
461
def test_add_quiet_is(self):
462
"""add -q does not print the names of added files."""
463
b = Branch.initialize('.')
464
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
465
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
466
# the ordering is not defined at the moment
467
results = sorted(out.rstrip('\n').split('\n'))
468
self.assertEquals([''], results)
470
def test_unknown_command(self):
471
"""Handling of unknown command."""
472
out, err = self.run_bzr_captured(['fluffy-badger'],
474
self.assertEquals(out, '')
475
err.index('unknown command')
477
def test_conflicts(self):
478
"""Handling of merge conflicts"""
481
file('hello', 'wb').write("hi world")
482
file('answer', 'wb').write("42")
485
self.runbzr('commit -m base')
486
self.runbzr('branch . ../other')
487
self.runbzr('branch . ../this')
489
file('hello', 'wb').write("Hello.")
490
file('answer', 'wb').write("Is anyone there?")
491
self.runbzr('commit -m other')
493
file('hello', 'wb').write("Hello, world")
494
self.runbzr('mv answer question')
495
file('question', 'wb').write("What do you get when you multiply six"
497
self.runbzr('commit -m this')
498
self.runbzr('merge ../other')
499
result = self.runbzr('conflicts', backtick=1)
500
self.assertEquals(result, "hello\nquestion\n")
501
result = self.runbzr('status', backtick=1)
502
assert "conflicts:\n hello\n question\n" in result, result
503
self.runbzr('resolve hello')
504
result = self.runbzr('conflicts', backtick=1)
505
self.assertEquals(result, "question\n")
506
self.runbzr('commit -m conflicts', retcode=1)
507
self.runbzr('resolve --all')
508
result = self.runbzr('conflicts', backtick=1)
509
self.runbzr('commit -m conflicts')
510
self.assertEquals(result, "")
512
def test_resign(self):
513
"""Test re signing of data."""
515
oldstrategy = bzrlib.gpg.GPGStrategy
516
branch = Branch.initialize('.')
517
branch.commit("base", allow_pointless=True, rev_id='A')
519
# monkey patch gpg signing mechanism
520
from bzrlib.testament import Testament
521
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
522
self.runbzr('re-sign -r revid:A')
523
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
524
branch.revision_store.get('A', 'sig').read())
526
bzrlib.gpg.GPGStrategy = oldstrategy
528
def listdir_sorted(dir):
534
class OldTests(ExternalBase):
535
"""old tests moved from ./testbzr."""
538
from os import chdir, mkdir
539
from os.path import exists
542
capture = self.capture
545
progress("basic branch creation")
550
self.assertEquals(capture('root').rstrip(),
551
os.path.join(self.test_dir, 'branch1'))
553
progress("status of new file")
555
f = file('test.txt', 'wt')
556
f.write('hello world!\n')
559
self.assertEquals(capture('unknowns'), 'test.txt\n')
561
out = capture("status")
562
assert out == 'unknown:\n test.txt\n'
564
out = capture("status --all")
565
assert out == "unknown:\n test.txt\n"
567
out = capture("status test.txt --all")
568
assert out == "unknown:\n test.txt\n"
570
f = file('test2.txt', 'wt')
571
f.write('goodbye cruel world...\n')
574
out = capture("status test.txt")
575
assert out == "unknown:\n test.txt\n"
577
out = capture("status")
578
assert out == ("unknown:\n"
582
os.unlink('test2.txt')
584
progress("command aliases")
585
out = capture("st --all")
586
assert out == ("unknown:\n"
589
out = capture("stat")
590
assert out == ("unknown:\n"
593
progress("command help")
596
runbzr("help commands")
597
runbzr("help slartibartfast", 1)
599
out = capture("help ci")
600
out.index('aliases: ')
602
progress("can't rename unversioned file")
603
runbzr("rename test.txt new-test.txt", 1)
605
progress("adding a file")
607
runbzr("add test.txt")
608
assert capture("unknowns") == ''
609
assert capture("status --all") == ("added:\n"
612
progress("rename newly-added file")
613
runbzr("rename test.txt hello.txt")
614
assert os.path.exists("hello.txt")
615
assert not os.path.exists("test.txt")
617
assert capture("revno") == '0\n'
619
progress("add first revision")
620
runbzr(['commit', '-m', 'add first revision'])
622
progress("more complex renames")
624
runbzr("rename hello.txt sub1", 1)
625
runbzr("rename hello.txt sub1/hello.txt", 1)
626
runbzr("move hello.txt sub1", 1)
629
runbzr("rename sub1 sub2")
630
runbzr("move hello.txt sub2")
631
self.assertEqual(capture("relpath sub2/hello.txt"),
632
os.path.join("sub2", "hello.txt\n"))
634
assert exists("sub2")
635
assert exists("sub2/hello.txt")
636
assert not exists("sub1")
637
assert not exists("hello.txt")
639
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
643
runbzr('move sub2/hello.txt sub1')
644
assert not exists('sub2/hello.txt')
645
assert exists('sub1/hello.txt')
646
runbzr('move sub2 sub1')
647
assert not exists('sub2')
648
assert exists('sub1/sub2')
650
runbzr(['commit', '-m', 'rename nested subdirectories'])
653
self.assertEquals(capture('root')[:-1],
654
os.path.join(self.test_dir, 'branch1'))
655
runbzr('move ../hello.txt .')
656
assert exists('./hello.txt')
657
self.assertEquals(capture('relpath hello.txt'),
658
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
659
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
660
runbzr(['commit', '-m', 'move to parent directory'])
662
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
664
runbzr('move sub2/hello.txt .')
665
assert exists('hello.txt')
667
f = file('hello.txt', 'wt')
668
f.write('some nice new content\n')
671
f = file('msg.tmp', 'wt')
672
f.write('this is my new commit\nand it has multiple lines, for fun')
675
runbzr('commit -F msg.tmp')
677
assert capture('revno') == '5\n'
678
runbzr('export -r 5 export-5.tmp')
679
runbzr('export export.tmp')
683
runbzr('log -v --forward')
684
runbzr('log -m', retcode=1)
685
log_out = capture('log -m commit')
686
assert "this is my new commit\n and" in log_out
687
assert "rename nested" not in log_out
688
assert 'revision-id' not in log_out
689
assert 'revision-id' in capture('log --show-ids -m commit')
691
log_out = capture('log --line')
692
for line in log_out.splitlines():
693
assert len(line) <= 79, len(line)
694
assert "this is my new commit and" in log_out
697
progress("file with spaces in name")
698
mkdir('sub directory')
699
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
702
runbzr('commit -m add-spaces')
706
runbzr('log --forward')
715
os.symlink("NOWHERE1", "link1")
717
assert self.capture('unknowns') == ''
718
runbzr(['commit', '-m', '1: added symlink link1'])
722
assert self.capture('unknowns') == ''
723
os.symlink("NOWHERE2", "d1/link2")
724
assert self.capture('unknowns') == 'd1/link2\n'
725
# is d1/link2 found when adding d1
727
assert self.capture('unknowns') == ''
728
os.symlink("NOWHERE3", "d1/link3")
729
assert self.capture('unknowns') == 'd1/link3\n'
730
runbzr(['commit', '-m', '2: added dir, symlink'])
732
runbzr('rename d1 d2')
733
runbzr('move d2/link2 .')
734
runbzr('move link1 d2')
735
assert os.readlink("./link2") == "NOWHERE2"
736
assert os.readlink("d2/link1") == "NOWHERE1"
737
runbzr('add d2/link3')
739
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
742
os.symlink("TARGET 2", "link2")
743
os.unlink("d2/link1")
744
os.symlink("TARGET 1", "d2/link1")
746
assert self.capture("relpath d2/link1") == "d2/link1\n"
747
runbzr(['commit', '-m', '4: retarget of two links'])
749
runbzr('remove d2/link1')
750
assert self.capture('unknowns') == 'd2/link1\n'
751
runbzr(['commit', '-m', '5: remove d2/link1'])
752
# try with the rm alias
753
runbzr('add d2/link1')
754
runbzr(['commit', '-m', '6: add d2/link1'])
755
runbzr('rm d2/link1')
756
assert self.capture('unknowns') == 'd2/link1\n'
757
runbzr(['commit', '-m', '7: remove d2/link1'])
761
runbzr('rename d2/link3 d1/link3new')
762
assert self.capture('unknowns') == 'd2/link1\n'
763
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
767
runbzr(['export', '-r', '1', 'exp1.tmp'])
769
assert listdir_sorted(".") == [ "link1" ]
770
assert os.readlink("link1") == "NOWHERE1"
773
runbzr(['export', '-r', '2', 'exp2.tmp'])
775
assert listdir_sorted(".") == [ "d1", "link1" ]
778
runbzr(['export', '-r', '3', 'exp3.tmp'])
780
assert listdir_sorted(".") == [ "d2", "link2" ]
781
assert listdir_sorted("d2") == [ "link1", "link3" ]
782
assert os.readlink("d2/link1") == "NOWHERE1"
783
assert os.readlink("link2") == "NOWHERE2"
786
runbzr(['export', '-r', '4', 'exp4.tmp'])
788
assert listdir_sorted(".") == [ "d2", "link2" ]
789
assert os.readlink("d2/link1") == "TARGET 1"
790
assert os.readlink("link2") == "TARGET 2"
791
assert listdir_sorted("d2") == [ "link1", "link3" ]
794
runbzr(['export', '-r', '5', 'exp5.tmp'])
796
assert listdir_sorted(".") == [ "d2", "link2" ]
797
assert os.path.islink("link2")
798
assert listdir_sorted("d2")== [ "link3" ]
801
runbzr(['export', '-r', '8', 'exp6.tmp'])
803
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
804
assert listdir_sorted("d1") == [ "link3new" ]
805
assert listdir_sorted("d2") == []
806
assert os.readlink("d1/link3new") == "NOWHERE3"
809
progress("skipping symlink tests")
812
class HttpTests(TestCaseWithWebserver):
813
"""Test bzr ui commands against remote branches."""
815
def test_branch(self):
817
branch = Branch.initialize('from')
818
branch.commit('empty commit for nonsense', allow_pointless=True)
819
url = self.get_remote_url('from')
820
self.run_bzr('branch', url, 'to')
821
branch = Branch.open('to')
822
self.assertEqual(1, len(branch.revision_history()))
825
self.build_tree(['branch/', 'branch/file'])
826
branch = Branch.initialize('branch')
828
branch.commit('add file', rev_id='A')
829
url = self.get_remote_url('branch/file')
830
output = self.capture('log %s' % url)
831
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
