31
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
32
# Note: Please don't add new tests here, it's too big and bulky. Instead add
33
# them into small suites in bzrlib.tests.blackbox.test_FOO for the particular
34
# UI command/aspect that is being tested.
37
27
from cStringIO import StringIO
43
33
from bzrlib.branch import Branch
44
import bzrlib.bzrdir as bzrdir
34
from bzrlib.clone import copy_branch
45
35
from bzrlib.errors import BzrCommandError
46
from bzrlib.osutils import (
52
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
53
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
54
from bzrlib.tests.blackbox import ExternalBase
55
from bzrlib.workingtree import WorkingTree
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)
58
53
class TestCommands(ExternalBase):
60
def test_nick_command(self):
61
"""bzr nick for viewing, setting nicknames"""
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."""
64
75
self.runbzr('init')
65
nick = self.runbzr("nick",backtick=True)
66
self.assertEqual(nick, 'me.dev\n')
67
nick = self.runbzr("nick moo")
68
nick = self.runbzr("nick",backtick=True)
69
self.assertEqual(nick, 'moo\n')
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
71
96
def test_invalid_commands(self):
72
self.runbzr("pants", retcode=3)
73
self.runbzr("--pants off", retcode=3)
74
self.runbzr("diff --message foo", retcode=3)
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'
76
146
def test_revert(self):
77
147
self.runbzr('init')
154
228
self.runbzr('export ../latest')
155
229
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
156
230
self.runbzr('export ../first -r 1')
157
self.assert_(not os.path.exists('../first/goodbye'))
231
assert not os.path.exists('../first/goodbye')
158
232
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
159
233
self.runbzr('export ../first.gz -r 1')
160
234
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
161
235
self.runbzr('export ../first.bz2 -r 1')
162
236
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
237
self.runbzr('export ../first.tar -r 1')
238
assert os.path.isfile('../first.tar')
164
239
from tarfile import TarFile
165
self.runbzr('export ../first.tar -r 1')
166
self.assert_(os.path.isfile('../first.tar'))
167
240
tf = TarFile('../first.tar')
168
self.assert_('first/hello' in tf.getnames(), tf.getnames())
241
assert 'first/hello' in tf.getnames(), tf.getnames()
169
242
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
170
243
self.runbzr('export ../first.tar.gz -r 1')
171
self.assert_(os.path.isfile('../first.tar.gz'))
244
assert os.path.isfile('../first.tar.gz')
172
245
self.runbzr('export ../first.tbz2 -r 1')
173
self.assert_(os.path.isfile('../first.tbz2'))
246
assert os.path.isfile('../first.tbz2')
174
247
self.runbzr('export ../first.tar.bz2 -r 1')
175
self.assert_(os.path.isfile('../first.tar.bz2'))
248
assert os.path.isfile('../first.tar.bz2')
176
249
self.runbzr('export ../first.tar.tbz2 -r 1')
177
self.assert_(os.path.isfile('../first.tar.tbz2'))
250
assert os.path.isfile('../first.tar.tbz2')
179
251
from bz2 import BZ2File
180
252
tf = TarFile('../first.tar.tbz2',
181
253
fileobj=BZ2File('../first.tar.tbz2', 'r'))
182
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
254
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
183
255
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
184
256
self.runbzr('export ../first2.tar -r 1 --root pizza')
185
257
tf = TarFile('../first2.tar')
186
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
188
from zipfile import ZipFile
189
self.runbzr('export ../first.zip -r 1')
190
self.failUnlessExists('../first.zip')
191
zf = ZipFile('../first.zip')
192
self.assert_('first/hello' in zf.namelist(), zf.namelist())
193
self.assertEqual(zf.read('first/hello'), 'foo')
195
self.runbzr('export ../first2.zip -r 1 --root pizza')
196
zf = ZipFile('../first2.zip')
197
self.assert_('pizza/hello' in zf.namelist(), zf.namelist())
199
self.runbzr('export ../first-zip --format=zip -r 1')
200
zf = ZipFile('../first-zip')
201
self.assert_('first-zip/hello' in zf.namelist(), zf.namelist())
203
def test_inventory(self):
205
def output_equals(value, *args):
206
out = self.runbzr(['inventory'] + list(args), backtick=True)
207
self.assertEquals(out, value)
210
open('a', 'wb').write('hello\n')
216
output_equals('a\n', '--kind', 'file')
217
output_equals('b\n', '--kind', 'directory')
219
def test_pull_verbose(self):
220
"""Pull changes from one branch to another and watch the output."""
226
self.example_branch()
231
open('b', 'wb').write('else\n')
233
bzr(['commit', '-m', 'added b'])
236
out = bzr('pull --verbose ../b', backtick=True)
237
self.failIfEqual(out.find('Added Revisions:'), -1)
238
self.failIfEqual(out.find('message:\n added b'), -1)
239
self.failIfEqual(out.find('added b'), -1)
241
# Check that --overwrite --verbose prints out the removed entries
242
bzr('commit -m foo --unchanged')
244
bzr('commit -m baz --unchanged')
245
bzr('pull ../a', retcode=3)
246
out = bzr('pull --overwrite --verbose ../a', backtick=1)
248
remove_loc = out.find('Removed Revisions:')
249
self.failIfEqual(remove_loc, -1)
250
added_loc = out.find('Added Revisions:')
251
self.failIfEqual(added_loc, -1)
253
removed_message = out.find('message:\n baz')
254
self.failIfEqual(removed_message, -1)
255
self.failUnless(remove_loc < removed_message < added_loc)
257
added_message = out.find('message:\n foo')
258
self.failIfEqual(added_message, -1)
259
self.failUnless(added_loc < added_message)
258
assert 'pizza/hello' in tf.getnames(), tf.getnames()
261
self.example_branch()
262
file('hello', 'wt').write('hello world!')
263
self.runbzr('commit -m fixing hello')
264
output = self.runbzr('diff -r 2..3', backtick=1)
265
self.assert_('\n+hello world!' in output)
266
output = self.runbzr('diff -r last:3..last:1', backtick=1)
267
self.assert_('\n+baz' in output)
269
def test_diff_branches(self):
270
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
271
branch = Branch.initialize('branch1')
273
branch.commit('add file')
274
copy_branch(branch, 'branch2')
275
print >> open('branch2/file', 'w'), 'new content'
276
branch2 = Branch.open('branch2')
277
branch2.commit('update file')
278
# should open branch1 and diff against branch2,
279
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
280
self.assertEquals(("=== modified file 'file'\n"
285
"+contents of branch1/file\n"
288
def test_branch(self):
289
"""Branch from one branch to another."""
292
self.example_branch()
294
self.runbzr('branch a b')
295
self.runbzr('branch a c -r 1')
297
self.runbzr('commit -m foo --unchanged')
299
# naughty - abstraction violations RBC 20050928
300
print "test_branch used to delete the stores, how is this meant to work ?"
301
#shutil.rmtree('a/.bzr/revision-store')
302
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
303
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
304
self.runbzr('branch a d --basis b')
306
def test_merge(self):
307
from bzrlib.branch import Branch
311
self.example_branch()
313
self.runbzr('branch a b')
315
file('goodbye', 'wt').write('quux')
316
self.runbzr(['commit', '-m', "more u's are always good"])
319
file('hello', 'wt').write('quuux')
320
# We can't merge when there are in-tree changes
321
self.runbzr('merge ../b', retcode=1)
322
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
323
self.runbzr('merge ../b')
324
self.check_file_contents('goodbye', 'quux')
325
# Merging a branch pulls its revision into the tree
327
b = Branch.open('../b')
328
a.get_revision_xml(b.last_revision())
329
self.log('pending merges: %s', a.pending_merges())
330
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
331
# % (a.pending_merges(), b.last_patch())
333
def test_merge_with_missing_file(self):
334
"""Merge handles missing file conflicts"""
338
print >> file('sub/a.txt', 'wb'), "hello"
339
print >> file('b.txt', 'wb'), "hello"
340
print >> file('sub/c.txt', 'wb'), "hello"
343
self.runbzr(('commit', '-m', 'added a'))
344
self.runbzr('branch . ../b')
345
print >> file('sub/a.txt', 'ab'), "there"
346
print >> file('b.txt', 'ab'), "there"
347
print >> file('sub/c.txt', 'ab'), "there"
348
self.runbzr(('commit', '-m', 'Added there'))
349
os.unlink('sub/a.txt')
350
os.unlink('sub/c.txt')
353
self.runbzr(('commit', '-m', 'Removed a.txt'))
355
print >> file('sub/a.txt', 'ab'), "something"
356
print >> file('b.txt', 'ab'), "something"
357
print >> file('sub/c.txt', 'ab'), "something"
358
self.runbzr(('commit', '-m', 'Modified a.txt'))
359
self.runbzr('merge ../a/')
360
assert os.path.exists('sub/a.txt.THIS')
361
assert os.path.exists('sub/a.txt.BASE')
363
self.runbzr('merge ../b/')
364
assert os.path.exists('sub/a.txt.OTHER')
365
assert os.path.exists('sub/a.txt.BASE')
368
"""Pull changes from one branch to another."""
372
self.example_branch()
373
self.runbzr('pull', retcode=1)
374
self.runbzr('missing', retcode=1)
375
self.runbzr('missing .')
376
self.runbzr('missing')
378
self.runbzr('pull /', retcode=1)
382
self.runbzr('branch a b')
386
self.runbzr('add subdir')
387
self.runbzr('commit -m blah --unchanged')
390
b = Branch.open('../b')
391
assert a.revision_history() == b.revision_history()[:-1]
392
self.runbzr('pull ../b')
393
assert a.revision_history() == b.revision_history()
394
self.runbzr('commit -m blah2 --unchanged')
396
self.runbzr('commit -m blah3 --unchanged')
397
self.runbzr('pull ../a', retcode=1)
398
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
401
self.runbzr('merge ../b')
402
self.runbzr('commit -m blah4 --unchanged')
403
os.chdir('../b/subdir')
404
self.runbzr('pull ../../a')
405
assert a.revision_history()[-1] == b.revision_history()[-1]
406
self.runbzr('commit -m blah5 --unchanged')
407
self.runbzr('commit -m blah6 --unchanged')
409
self.runbzr('pull ../a')
411
self.runbzr('commit -m blah7 --unchanged')
412
self.runbzr('merge ../b')
413
self.runbzr('commit -m blah8 --unchanged')
414
self.runbzr('pull ../b')
415
self.runbzr('pull ../b')
261
417
def test_locations(self):
262
418
"""Using and remembering different locations"""
265
421
self.runbzr('init')
266
422
self.runbzr('commit -m unchanged --unchanged')
267
self.runbzr('pull', retcode=3)
268
self.runbzr('merge', retcode=3)
423
self.runbzr('pull', retcode=1)
424
self.runbzr('merge', retcode=1)
269
425
self.runbzr('branch . ../b')
271
427
self.runbzr('pull')
314
482
file('question', 'wb').write("What do you get when you multiply six"
316
484
self.runbzr('commit -m this')
318
def test_status(self):
322
self.runbzr('commit --unchanged --message f')
323
self.runbzr('branch . ../branch2')
324
self.runbzr('branch . ../branch3')
325
self.runbzr('commit --unchanged --message peter')
326
os.chdir('../branch2')
327
self.runbzr('merge ../branch1')
328
self.runbzr('commit --unchanged --message pumpkin')
329
os.chdir('../branch3')
330
self.runbzr('merge ../branch2')
331
message = self.capture('status')
334
def test_conflicts(self):
335
"""Handling of merge conflicts"""
336
self.create_conflicts()
337
self.runbzr('merge ../other --show-base', retcode=1)
338
conflict_text = file('hello').read()
339
self.assert_('<<<<<<<' in conflict_text)
340
self.assert_('>>>>>>>' in conflict_text)
341
self.assert_('=======' in conflict_text)
342
self.assert_('|||||||' in conflict_text)
343
self.assert_('hi world' in conflict_text)
344
self.runbzr('revert')
345
self.runbzr('resolve --all')
346
self.runbzr('merge ../other', retcode=1)
347
conflict_text = file('hello').read()
348
self.assert_('|||||||' not in conflict_text)
349
self.assert_('hi world' not in conflict_text)
485
self.runbzr('merge ../other')
350
486
result = self.runbzr('conflicts', backtick=1)
351
self.assertEquals(result, "Text conflict in hello\nText conflict in"
487
self.assertEquals(result, "hello\nquestion\n")
353
488
result = self.runbzr('status', backtick=1)
354
self.assert_("conflicts:\n Text conflict in hello\n"
355
" Text conflict in question\n" in result, result)
489
assert "conflicts:\n hello\n question\n" in result, result
356
490
self.runbzr('resolve hello')
357
491
result = self.runbzr('conflicts', backtick=1)
358
self.assertEquals(result, "Text conflict in question\n")
359
self.runbzr('commit -m conflicts', retcode=3)
492
self.assertEquals(result, "question\n")
493
self.runbzr('commit -m conflicts', retcode=1)
360
494
self.runbzr('resolve --all')
361
495
result = self.runbzr('conflicts', backtick=1)
362
496
self.runbzr('commit -m conflicts')
363
497
self.assertEquals(result, "")
366
# create a source branch
367
os.mkdir('my-branch')
368
os.chdir('my-branch')
369
self.example_branch()
371
# with no push target, fail
372
self.runbzr('push', retcode=3)
373
# with an explicit target work
374
self.runbzr('push ../output-branch')
375
# with an implicit target work
378
self.runbzr('missing ../output-branch')
379
# advance this branch
380
self.runbzr('commit --unchanged -m unchanged')
382
os.chdir('../output-branch')
383
# There is no longer a difference as long as we have
384
# access to the working tree
387
# But we should be missing a revision
388
self.runbzr('missing ../my-branch', retcode=1)
390
# diverge the branches
391
self.runbzr('commit --unchanged -m unchanged')
392
os.chdir('../my-branch')
394
self.runbzr('push', retcode=3)
395
# and there are difference
396
self.runbzr('missing ../output-branch', retcode=1)
397
self.runbzr('missing --verbose ../output-branch', retcode=1)
398
# but we can force a push
399
self.runbzr('push --overwrite')
401
self.runbzr('missing ../output-branch')
403
# pushing to a new dir with no parent should fail
404
self.runbzr('push ../missing/new-branch', retcode=3)
405
# unless we provide --create-prefix
406
self.runbzr('push --create-prefix ../missing/new-branch')
408
self.runbzr('missing ../missing/new-branch')
410
def test_external_command(self):
411
"""Test that external commands can be run by setting the path
413
# We don't at present run bzr in a subprocess for blackbox tests, and so
414
# don't really capture stdout, only the internal python stream.
415
# Therefore we don't use a subcommand that produces any output or does
416
# anything -- we just check that it can be run successfully.
417
cmd_name = 'test-command'
418
if sys.platform == 'win32':
420
oldpath = os.environ.get('BZRPATH', None)
423
if os.environ.has_key('BZRPATH'):
424
del os.environ['BZRPATH']
426
f = file(cmd_name, 'wb')
427
if sys.platform == 'win32':
428
f.write('@echo off\n')
430
f.write('#!/bin/sh\n')
431
# f.write('echo Hello from test-command')
433
os.chmod(cmd_name, 0755)
435
# It should not find the command in the local
436
# directory by default, since it is not in my path
437
bzr(cmd_name, retcode=3)
439
# Now put it into my path
440
os.environ['BZRPATH'] = '.'
444
# Make sure empty path elements are ignored
445
os.environ['BZRPATH'] = os.pathsep
447
bzr(cmd_name, retcode=3)
451
os.environ['BZRPATH'] = oldpath
454
499
def listdir_sorted(dir):
455
500
L = os.listdir(dir)
485
530
self.assertEquals(capture('unknowns'), 'test.txt\n')
487
532
out = capture("status")
488
self.assertEquals(out, 'unknown:\n test.txt\n')
533
assert out == 'unknown:\n test.txt\n'
535
out = capture("status --all")
536
assert out == "unknown:\n test.txt\n"
538
out = capture("status test.txt --all")
539
assert out == "unknown:\n test.txt\n"
490
541
f = file('test2.txt', 'wt')
491
542
f.write('goodbye cruel world...\n')
494
545
out = capture("status test.txt")
495
self.assertEquals(out, "unknown:\n test.txt\n")
546
assert out == "unknown:\n test.txt\n"
497
548
out = capture("status")
498
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
549
assert out == ("unknown:\n"
500
553
os.unlink('test2.txt')
502
555
progress("command aliases")
504
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
556
out = capture("st --all")
557
assert out == ("unknown:\n"
506
560
out = capture("stat")
507
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
561
assert out == ("unknown:\n"
509
564
progress("command help")
510
565
runbzr("help st")
512
567
runbzr("help commands")
513
runbzr("help slartibartfast", 3)
568
runbzr("help slartibartfast", 1)
515
570
out = capture("help ci")
516
571
out.index('aliases: ')
573
progress("can't rename unversioned file")
574
runbzr("rename test.txt new-test.txt", 1)
576
progress("adding a file")
578
runbzr("add test.txt")
579
assert capture("unknowns") == ''
580
assert capture("status --all") == ("added:\n"
583
progress("rename newly-added file")
584
runbzr("rename test.txt hello.txt")
585
assert os.path.exists("hello.txt")
586
assert not os.path.exists("test.txt")
588
assert capture("revno") == '0\n'
590
progress("add first revision")
591
runbzr(['commit', '-m', 'add first revision'])
593
progress("more complex renames")
595
runbzr("rename hello.txt sub1", 1)
596
runbzr("rename hello.txt sub1/hello.txt", 1)
597
runbzr("move hello.txt sub1", 1)
600
runbzr("rename sub1 sub2")
601
runbzr("move hello.txt sub2")
602
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
604
assert exists("sub2")
605
assert exists("sub2/hello.txt")
606
assert not exists("sub1")
607
assert not exists("hello.txt")
609
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
613
runbzr('move sub2/hello.txt sub1')
614
assert not exists('sub2/hello.txt')
615
assert exists('sub1/hello.txt')
616
runbzr('move sub2 sub1')
617
assert not exists('sub2')
618
assert exists('sub1/sub2')
620
runbzr(['commit', '-m', 'rename nested subdirectories'])
623
self.assertEquals(capture('root')[:-1],
624
os.path.join(self.test_dir, 'branch1'))
625
runbzr('move ../hello.txt .')
626
assert exists('./hello.txt')
627
self.assertEquals(capture('relpath hello.txt'),
628
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
629
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
630
runbzr(['commit', '-m', 'move to parent directory'])
632
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
634
runbzr('move sub2/hello.txt .')
635
assert exists('hello.txt')
518
637
f = file('hello.txt', 'wt')
519
638
f.write('some nice new content\n')
522
runbzr("add hello.txt")
524
641
f = file('msg.tmp', 'wt')
525
f.write('this is my new commit\nand it has multiple lines, for fun')
642
f.write('this is my new commit\n')
528
645
runbzr('commit -F msg.tmp')
530
self.assertEquals(capture('revno'), '1\n')
531
runbzr('export -r 1 export-1.tmp')
647
assert capture('revno') == '5\n'
648
runbzr('export -r 5 export-5.tmp')
532
649
runbzr('export export.tmp')
536
653
runbzr('log -v --forward')
537
runbzr('log -m', retcode=3)
654
runbzr('log -m', retcode=1)
538
655
log_out = capture('log -m commit')
539
self.assert_("this is my new commit\n and" in log_out)
540
self.assert_("rename nested" not in log_out)
541
self.assert_('revision-id' not in log_out)
542
self.assert_('revision-id' in capture('log --show-ids -m commit'))
656
assert "this is my new commit" in log_out
657
assert "rename nested" not in log_out
658
assert 'revision-id' not in log_out
659
assert 'revision-id' in capture('log --show-ids -m commit')
544
log_out = capture('log --line')
545
# determine the widest line we want
546
max_width = terminal_width() - 1
547
for line in log_out.splitlines():
548
self.assert_(len(line) <= max_width, len(line))
549
self.assert_("this is my new commit and" not in log_out)
550
self.assert_("this is my new commit" in log_out)
552
662
progress("file with spaces in name")
553
663
mkdir('sub directory')
554
664
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
556
runbzr('diff', retcode=1)
557
667
runbzr('commit -m add-spaces')
570
680
os.symlink("NOWHERE1", "link1")
571
681
runbzr('add link1')
572
self.assertEquals(self.capture('unknowns'), '')
682
assert self.capture('unknowns') == ''
573
683
runbzr(['commit', '-m', '1: added symlink link1'])
577
self.assertEquals(self.capture('unknowns'), '')
687
assert self.capture('unknowns') == ''
578
688
os.symlink("NOWHERE2", "d1/link2")
579
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
689
assert self.capture('unknowns') == 'd1/link2\n'
580
690
# is d1/link2 found when adding d1
582
self.assertEquals(self.capture('unknowns'), '')
692
assert self.capture('unknowns') == ''
583
693
os.symlink("NOWHERE3", "d1/link3")
584
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
694
assert self.capture('unknowns') == 'd1/link3\n'
585
695
runbzr(['commit', '-m', '2: added dir, symlink'])
587
697
runbzr('rename d1 d2')
588
698
runbzr('move d2/link2 .')
589
699
runbzr('move link1 d2')
590
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
591
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
700
assert os.readlink("./link2") == "NOWHERE2"
701
assert os.readlink("d2/link1") == "NOWHERE1"
592
702
runbzr('add d2/link3')
593
runbzr('diff', retcode=1)
594
704
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
596
706
os.unlink("link2")
597
707
os.symlink("TARGET 2", "link2")
598
708
os.unlink("d2/link1")
599
709
os.symlink("TARGET 1", "d2/link1")
600
runbzr('diff', retcode=1)
601
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
711
assert self.capture("relpath d2/link1") == "d2/link1\n"
602
712
runbzr(['commit', '-m', '4: retarget of two links'])
604
714
runbzr('remove d2/link1')
605
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
715
assert self.capture('unknowns') == 'd2/link1\n'
606
716
runbzr(['commit', '-m', '5: remove d2/link1'])
607
717
# try with the rm alias
608
718
runbzr('add d2/link1')
609
719
runbzr(['commit', '-m', '6: add d2/link1'])
610
720
runbzr('rm d2/link1')
611
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
721
assert self.capture('unknowns') == 'd2/link1\n'
612
722
runbzr(['commit', '-m', '7: remove d2/link1'])
616
726
runbzr('rename d2/link3 d1/link3new')
617
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
727
assert self.capture('unknowns') == 'd2/link1\n'
618
728
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
620
730
runbzr(['check'])
622
732
runbzr(['export', '-r', '1', 'exp1.tmp'])
623
733
chdir("exp1.tmp")
624
self.assertEquals(listdir_sorted("."), [ "link1" ])
625
self.assertEquals(os.readlink("link1"), "NOWHERE1")
734
assert listdir_sorted(".") == [ "link1" ]
735
assert os.readlink("link1") == "NOWHERE1"
628
738
runbzr(['export', '-r', '2', 'exp2.tmp'])
629
739
chdir("exp2.tmp")
630
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
740
assert listdir_sorted(".") == [ "d1", "link1" ]
633
743
runbzr(['export', '-r', '3', 'exp3.tmp'])
634
744
chdir("exp3.tmp")
635
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
636
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
637
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
638
self.assertEquals(os.readlink("link2") , "NOWHERE2")
745
assert listdir_sorted(".") == [ "d2", "link2" ]
746
assert listdir_sorted("d2") == [ "link1", "link3" ]
747
assert os.readlink("d2/link1") == "NOWHERE1"
748
assert os.readlink("link2") == "NOWHERE2"
641
751
runbzr(['export', '-r', '4', 'exp4.tmp'])
642
752
chdir("exp4.tmp")
643
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
644
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
645
self.assertEquals(os.readlink("link2") , "TARGET 2")
646
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
753
assert listdir_sorted(".") == [ "d2", "link2" ]
754
assert os.readlink("d2/link1") == "TARGET 1"
755
assert os.readlink("link2") == "TARGET 2"
756
assert listdir_sorted("d2") == [ "link1", "link3" ]
649
759
runbzr(['export', '-r', '5', 'exp5.tmp'])
650
760
chdir("exp5.tmp")
651
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
652
self.assert_(os.path.islink("link2"))
653
self.assert_(listdir_sorted("d2")== [ "link3" ])
761
assert listdir_sorted(".") == [ "d2", "link2" ]
762
assert os.path.islink("link2")
763
assert listdir_sorted("d2")== [ "link3" ]
656
766
runbzr(['export', '-r', '8', 'exp6.tmp'])
657
767
chdir("exp6.tmp")
658
768
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
659
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
660
self.assertEquals(listdir_sorted("d2"), [])
661
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
769
assert listdir_sorted("d1") == [ "link3new" ]
770
assert listdir_sorted("d2") == []
771
assert os.readlink("d1/link3new") == "NOWHERE3"
664
774
progress("skipping symlink tests")
667
class RemoteTests(object):
777
class HttpTests(TestCaseWithWebserver):
668
778
"""Test bzr ui commands against remote branches."""
670
780
def test_branch(self):
672
wt = self.make_branch_and_tree('from')
674
wt.commit('empty commit for nonsense', allow_pointless=True)
675
url = self.get_readonly_url('from')
782
branch = Branch.initialize('from')
783
branch.commit('empty commit for nonsense', allow_pointless=True)
784
url = self.get_remote_url('from')
676
785
self.run_bzr('branch', url, 'to')
677
786
branch = Branch.open('to')
678
787
self.assertEqual(1, len(branch.revision_history()))
679
# the branch should be set in to to from
680
self.assertEqual(url + '/', branch.get_parent())
683
self.build_tree(['branch/', 'branch/file'])
684
self.capture('init branch')
685
self.capture('add branch/file')
686
self.capture('commit -m foo branch')
687
url = self.get_readonly_url('branch/file')
688
output = self.capture('log %s' % url)
689
self.assertEqual(8, len(output.split('\n')))
691
def test_check(self):
692
self.build_tree(['branch/', 'branch/file'])
693
self.capture('init branch')
694
self.capture('add branch/file')
695
self.capture('commit -m foo branch')
696
url = self.get_readonly_url('branch/')
697
self.run_bzr('check', url)
700
# create a source branch
701
os.mkdir('my-branch')
702
os.chdir('my-branch')
704
file('hello', 'wt').write('foo')
705
self.run_bzr('add', 'hello')
706
self.run_bzr('commit', '-m', 'setup')
708
# with an explicit target work
709
self.run_bzr('push', self.get_url('output-branch'))
712
class HTTPTests(TestCaseWithWebserver, RemoteTests):
713
"""Test various commands against a HTTP server."""
716
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
717
"""Test various commands against a SFTP server using abs paths."""
720
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
721
"""Test various commands against a SFTP server using abs paths."""
724
super(SFTPTestsAbsoluteSibling, self).setUp()
725
self._override_home = '/dev/noone/runs/tests/here'
728
class SFTPTestsRelative(TestCaseWithSFTPServer, RemoteTests):
729
"""Test various commands against a SFTP server using homedir rel paths."""
732
super(SFTPTestsRelative, self).setUp()
733
self._get_remote_is_absolute = False
added
removed
bzrlib/selftest/blackbox.py
