1
# Copyright (C) 2005, 2007 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
5
6
# the Free Software Foundation; either version 2 of the License, or
6
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
9
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# Mr. Smoketoomuch: I'm sorry?
18
# Mr. Bounder: You'd better cut down a little then.
19
# Mr. Smoketoomuch: Oh, I see! Smoke too much so I'd better cut down a little
22
19
"""Black-box tests for bzr.
24
21
These check that it behaves properly when it's invoked through the regular
25
command-line interface. This doesn't actually run a new interpreter but
26
rather starts again from the run_bzr function.
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.
30
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
31
# Note: Please don't add new tests here, it's too big and bulky. Instead add
32
# them into small suites in bzrlib.tests.blackbox.test_FOO for the particular
33
# UI command/aspect that is being tested.
36
from cStringIO import StringIO
45
from bzrlib.branch import Branch
46
from bzrlib.errors import BzrCommandError
47
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
58
class TestCommands(ExternalBase):
60
def test_invalid_commands(self):
61
self.run_bzr("pants", retcode=3)
62
self.run_bzr("--pants off", retcode=3)
63
self.run_bzr("diff --message foo", retcode=3)
65
def test_revert(self):
68
file('hello', 'wt').write('foo')
69
self.run_bzr('add hello')
70
self.run_bzr('commit -m setup hello')
72
file('goodbye', 'wt').write('baz')
73
self.run_bzr('add goodbye')
74
self.run_bzr('commit -m setup goodbye')
76
file('hello', 'wt').write('bar')
77
file('goodbye', 'wt').write('qux')
78
self.run_bzr('revert hello')
79
self.check_file_contents('hello', 'foo')
80
self.check_file_contents('goodbye', 'qux')
81
self.run_bzr('revert')
82
self.check_file_contents('goodbye', 'baz')
85
self.run_bzr('add revertdir')
86
self.run_bzr('commit -m f')
88
self.run_bzr('revert')
91
os.symlink('/unlikely/to/exist', 'symlink')
92
self.run_bzr('add symlink')
93
self.run_bzr('commit -m f')
95
self.run_bzr('revert')
96
self.failUnlessExists('symlink')
98
os.symlink('a-different-path', 'symlink')
99
self.run_bzr('revert')
100
self.assertEqual('/unlikely/to/exist',
101
os.readlink('symlink'))
103
self.log("skipping revert symlink tests")
105
file('hello', 'wt').write('xyz')
106
self.run_bzr('commit -m xyz hello')
107
self.run_bzr('revert -r 1 hello')
108
self.check_file_contents('hello', 'foo')
109
self.run_bzr('revert hello')
110
self.check_file_contents('hello', 'xyz')
111
os.chdir('revertdir')
112
self.run_bzr('revert')
115
def test_main_version(self):
116
"""Check output from version command and master option is reasonable"""
31
from bzrlib.selftest import TestBase, InTempDir, BzrTestBase
35
class ExternalBase(InTempDir):
36
def runbzr(self, args, retcode=0):
39
from subprocess import call
40
except ImportError, e:
44
if isinstance(args, basestring):
47
return self.runcmd(['python', self.BZRPATH,] + args,
52
class TestVersion(BzrTestBase):
53
"""Check output from version command and master option is reasonable"""
117
55
# output is intentionally passed through to stdout so that we
118
56
# can see the version being tested
119
output = self.run_bzr('version')[0]
57
from cStringIO import StringIO
60
sys.stdout = tmp_out = StringIO()
62
self.run_bzr('version')
66
output = tmp_out.getvalue()
120
67
self.log('bzr version output:')
122
self.assert_(output.startswith('Bazaar (bzr) '))
70
self.assert_(output.startswith('bzr (bazaar-ng) '))
123
71
self.assertNotEqual(output.index('Canonical'), -1)
124
73
# make sure --version is consistent
125
tmp_output = self.run_bzr('--version')[0]
126
self.assertEquals(output, tmp_output)
128
def example_branch(test):
130
file('hello', 'wt').write('foo')
131
test.run_bzr('add hello')
132
test.run_bzr('commit -m setup hello')
133
file('goodbye', 'wt').write('baz')
134
test.run_bzr('add goodbye')
135
test.run_bzr('commit -m setup goodbye')
137
def test_pull_verbose(self):
138
"""Pull changes from one branch to another and watch the output."""
143
self.example_branch()
146
self.run_bzr('branch a b')
148
open('b', 'wb').write('else\n')
149
self.run_bzr('add b')
150
self.run_bzr(['commit', '-m', 'added b'])
153
out = self.run_bzr('pull --verbose ../b')[0]
154
self.failIfEqual(out.find('Added Revisions:'), -1)
155
self.failIfEqual(out.find('message:\n added b'), -1)
156
self.failIfEqual(out.find('added b'), -1)
158
# Check that --overwrite --verbose prints out the removed entries
159
self.run_bzr('commit -m foo --unchanged')
161
self.run_bzr('commit -m baz --unchanged')
162
self.run_bzr('pull ../a', retcode=3)
163
out = self.run_bzr('pull --overwrite --verbose ../a')[0]
165
remove_loc = out.find('Removed Revisions:')
166
self.failIfEqual(remove_loc, -1)
167
added_loc = out.find('Added Revisions:')
168
self.failIfEqual(added_loc, -1)
170
removed_message = out.find('message:\n baz')
171
self.failIfEqual(removed_message, -1)
172
self.failUnless(remove_loc < removed_message < added_loc)
174
added_message = out.find('message:\n foo')
175
self.failIfEqual(added_message, -1)
176
self.failUnless(added_loc < added_message)
178
def test_locations(self):
179
"""Using and remembering different locations"""
183
self.run_bzr('commit -m unchanged --unchanged')
184
self.run_bzr('pull', retcode=3)
185
self.run_bzr('merge', retcode=3)
186
self.run_bzr('branch . ../b')
189
self.run_bzr('branch . ../c')
190
self.run_bzr('pull ../c')
191
self.run_bzr('merge')
193
self.run_bzr('pull ../b')
195
self.run_bzr('pull ../c')
196
self.run_bzr('branch ../c ../d')
197
osutils.rmtree('../c')
202
self.run_bzr('pull', retcode=3)
203
self.run_bzr('pull ../a --remember')
206
def test_unknown_command(self):
207
"""Handling of unknown command."""
208
out, err = self.run_bzr('fluffy-badger', retcode=3)
209
self.assertEquals(out, '')
210
err.index('unknown command')
212
def create_conflicts(self):
213
"""Create a conflicted tree"""
216
file('hello', 'wb').write("hi world")
217
file('answer', 'wb').write("42")
220
self.run_bzr('commit -m base')
221
self.run_bzr('branch . ../other')
222
self.run_bzr('branch . ../this')
224
file('hello', 'wb').write("Hello.")
225
file('answer', 'wb').write("Is anyone there?")
226
self.run_bzr('commit -m other')
228
file('hello', 'wb').write("Hello, world")
229
self.run_bzr('mv answer question')
230
file('question', 'wb').write("What do you get when you multiply six"
232
self.run_bzr('commit -m this')
234
def test_status(self):
238
self.run_bzr('commit --unchanged --message f')
239
self.run_bzr('branch . ../branch2')
240
self.run_bzr('branch . ../branch3')
241
self.run_bzr('commit --unchanged --message peter')
242
os.chdir('../branch2')
243
self.run_bzr('merge ../branch1')
244
self.run_bzr('commit --unchanged --message pumpkin')
245
os.chdir('../branch3')
246
self.run_bzr('merge ../branch2')
247
message = self.run_bzr('status')[0]
250
def test_conflicts(self):
251
"""Handling of merge conflicts"""
252
self.create_conflicts()
253
self.run_bzr('merge ../other --show-base', retcode=1)
254
conflict_text = file('hello').read()
255
self.assert_('<<<<<<<' in conflict_text)
256
self.assert_('>>>>>>>' in conflict_text)
257
self.assert_('=======' in conflict_text)
258
self.assert_('|||||||' in conflict_text)
259
self.assert_('hi world' in conflict_text)
260
self.run_bzr('revert')
261
self.run_bzr('resolve --all')
262
self.run_bzr('merge ../other', retcode=1)
263
conflict_text = file('hello').read()
264
self.assert_('|||||||' not in conflict_text)
265
self.assert_('hi world' not in conflict_text)
266
result = self.run_bzr('conflicts')[0]
267
self.assertEquals(result, "Text conflict in hello\nText conflict in"
269
result = self.run_bzr('status')[0]
270
self.assert_("conflicts:\n Text conflict in hello\n"
271
" Text conflict in question\n" in result, result)
272
self.run_bzr('resolve hello')
273
result = self.run_bzr('conflicts')[0]
274
self.assertEquals(result, "Text conflict in question\n")
275
self.run_bzr('commit -m conflicts', retcode=3)
276
self.run_bzr('resolve --all')
277
result = self.run_bzr('conflicts')[0]
278
self.run_bzr('commit -m conflicts')
279
self.assertEquals(result, "")
282
# create a source branch
283
os.mkdir('my-branch')
284
os.chdir('my-branch')
285
self.example_branch()
287
# with no push target, fail
288
self.run_bzr('push', retcode=3)
289
# with an explicit target work
290
self.run_bzr('push ../output-branch')
291
# with an implicit target work
294
self.run_bzr('missing ../output-branch')
295
# advance this branch
296
self.run_bzr('commit --unchanged -m unchanged')
298
os.chdir('../output-branch')
299
# There is no longer a difference as long as we have
300
# access to the working tree
303
# But we should be missing a revision
304
self.run_bzr('missing ../my-branch', retcode=1)
306
# diverge the branches
307
self.run_bzr('commit --unchanged -m unchanged')
308
os.chdir('../my-branch')
310
self.run_bzr('push', retcode=3)
311
# and there are difference
312
self.run_bzr('missing ../output-branch', retcode=1)
313
self.run_bzr('missing --verbose ../output-branch', retcode=1)
314
# but we can force a push
315
self.run_bzr('push --overwrite')
317
self.run_bzr('missing ../output-branch')
319
# pushing to a new dir with no parent should fail
320
self.run_bzr('push ../missing/new-branch', retcode=3)
321
# unless we provide --create-prefix
322
self.run_bzr('push --create-prefix ../missing/new-branch')
324
self.run_bzr('missing ../missing/new-branch')
326
def test_external_command(self):
327
"""Test that external commands can be run by setting the path
329
# We don't at present run bzr in a subprocess for blackbox tests, and so
330
# don't really capture stdout, only the internal python stream.
331
# Therefore we don't use a subcommand that produces any output or does
332
# anything -- we just check that it can be run successfully.
333
cmd_name = 'test-command'
334
if sys.platform == 'win32':
336
oldpath = os.environ.get('BZRPATH', None)
338
if 'BZRPATH' in os.environ:
339
del os.environ['BZRPATH']
341
f = file(cmd_name, 'wb')
342
if sys.platform == 'win32':
343
f.write('@echo off\n')
345
f.write('#!/bin/sh\n')
346
# f.write('echo Hello from test-command')
348
os.chmod(cmd_name, 0755)
350
# It should not find the command in the local
351
# directory by default, since it is not in my path
352
self.run_bzr(cmd_name, retcode=3)
354
# Now put it into my path
355
os.environ['BZRPATH'] = '.'
357
self.run_bzr(cmd_name)
359
# Make sure empty path elements are ignored
360
os.environ['BZRPATH'] = os.pathsep
362
self.run_bzr(cmd_name, retcode=3)
75
sys.stdout = tmp_out = StringIO()
77
self.run_bzr('--version')
366
os.environ['BZRPATH'] = oldpath
369
def listdir_sorted(dir):
81
self.log('bzr --version output:')
82
self.log(tmp_out.getvalue())
84
self.assertEquals(output, tmp_out.getvalue())
90
class HelpCommands(ExternalBase):
94
self.runbzr('help commands')
95
self.runbzr('help help')
96
self.runbzr('commit -h')
99
class InitBranch(ExternalBase):
102
self.runbzr(['init'])
106
class UserIdentity(ExternalBase):
108
# this should always identify something, if only "john@localhost"
109
self.runbzr("whoami")
110
self.runbzr("whoami --email")
111
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
115
class InvalidCommands(ExternalBase):
117
self.runbzr("pants", retcode=1)
118
self.runbzr("--pants off", retcode=1)
119
self.runbzr("diff --message foo", retcode=1)
123
class EmptyCommit(ExternalBase):
126
self.build_tree(['hello.txt'])
127
self.runbzr("commit -m empty", retcode=1)
128
self.runbzr("add hello.txt")
129
self.runbzr("commit -m added")
133
class IgnorePatterns(ExternalBase):
135
from bzrlib.branch import Branch
137
b = Branch('.', init=True)
138
self.assertEquals(list(b.unknowns()), [])
140
file('foo.tmp', 'wt').write('tmp files are ignored')
141
self.assertEquals(list(b.unknowns()), [])
142
assert self.backtick('bzr unknowns') == ''
144
file('foo.c', 'wt').write('int main() {}')
145
self.assertEquals(list(b.unknowns()), ['foo.c'])
146
assert self.backtick('bzr unknowns') == 'foo.c\n'
148
self.runbzr(['add', 'foo.c'])
149
assert self.backtick('bzr unknowns') == ''
151
# 'ignore' works when creating the .bzignore file
152
file('foo.blah', 'wt').write('blah')
153
self.assertEquals(list(b.unknowns()), ['foo.blah'])
154
self.runbzr('ignore *.blah')
155
self.assertEquals(list(b.unknowns()), [])
156
assert file('.bzrignore', 'rb').read() == '*.blah\n'
158
# 'ignore' works when then .bzrignore file already exists
159
file('garh', 'wt').write('garh')
160
self.assertEquals(list(b.unknowns()), ['garh'])
161
assert self.backtick('bzr unknowns') == 'garh\n'
162
self.runbzr('ignore garh')
163
self.assertEquals(list(b.unknowns()), [])
164
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
375
169
class OldTests(ExternalBase):
376
"""old tests moved from ./testbzr."""
170
# old tests moved from ./testbzr
379
172
from os import chdir, mkdir
380
173
from os.path import exists
177
backtick = self.backtick
382
178
progress = self.log
384
180
progress("basic branch creation")
389
self.assertEquals(self.run_bzr('root')[0].rstrip(),
390
pathjoin(self.test_dir, 'branch1'))
185
self.assertEquals(backtick('bzr root').rstrip(),
186
os.path.join(self.test_dir, 'branch1'))
392
188
progress("status of new file")
395
191
f.write('hello world!\n')
398
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
400
out = self.run_bzr("status")[0]
401
self.assertEquals(out, 'unknown:\n test.txt\n')
194
out = backtick("bzr unknowns")
195
self.assertEquals(out, 'test.txt\n')
197
out = backtick("bzr status")
198
assert out == 'unknown:\n test.txt\n'
200
out = backtick("bzr status --all")
201
assert out == "unknown:\n test.txt\n"
203
out = backtick("bzr status test.txt --all")
204
assert out == "unknown:\n test.txt\n"
403
206
f = file('test2.txt', 'wt')
404
207
f.write('goodbye cruel world...\n')
407
out = self.run_bzr("status test.txt")[0]
408
self.assertEquals(out, "unknown:\n test.txt\n")
210
out = backtick("bzr status test.txt")
211
assert out == "unknown:\n test.txt\n"
410
out = self.run_bzr("status")[0]
411
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
213
out = backtick("bzr status")
214
assert out == ("unknown:\n"
413
218
os.unlink('test2.txt')
415
220
progress("command aliases")
416
out = self.run_bzr("st")[0]
417
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
221
out = backtick("bzr st --all")
222
assert out == ("unknown:\n"
419
out = self.run_bzr("stat")[0]
420
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
225
out = backtick("bzr stat")
226
assert out == ("unknown:\n"
422
229
progress("command help")
423
self.run_bzr("help st")
425
self.run_bzr("help commands")
426
self.run_bzr("help slartibartfast", retcode=3)
428
out = self.run_bzr("help ci")[0]
429
out.index('Aliases: ci, checkin\n')
232
runbzr("help commands")
233
runbzr("help slartibartfast", 1)
235
out = backtick("bzr help ci")
236
out.index('aliases: ')
238
progress("can't rename unversioned file")
239
runbzr("rename test.txt new-test.txt", 1)
241
progress("adding a file")
243
runbzr("add test.txt")
244
assert backtick("bzr unknowns") == ''
245
assert backtick("bzr status --all") == ("added:\n"
248
progress("rename newly-added file")
249
runbzr("rename test.txt hello.txt")
250
assert os.path.exists("hello.txt")
251
assert not os.path.exists("test.txt")
253
assert backtick("bzr revno") == '0\n'
255
progress("add first revision")
256
runbzr(['commit', '-m', 'add first revision'])
258
progress("more complex renames")
260
runbzr("rename hello.txt sub1", 1)
261
runbzr("rename hello.txt sub1/hello.txt", 1)
262
runbzr("move hello.txt sub1", 1)
265
runbzr("rename sub1 sub2")
266
runbzr("move hello.txt sub2")
267
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
269
assert exists("sub2")
270
assert exists("sub2/hello.txt")
271
assert not exists("sub1")
272
assert not exists("hello.txt")
274
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
278
runbzr('move sub2/hello.txt sub1')
279
assert not exists('sub2/hello.txt')
280
assert exists('sub1/hello.txt')
281
runbzr('move sub2 sub1')
282
assert not exists('sub2')
283
assert exists('sub1/sub2')
285
runbzr(['commit', '-m', 'rename nested subdirectories'])
288
self.assertEquals(backtick('bzr root')[:-1],
289
os.path.join(self.test_dir, 'branch1'))
290
runbzr('move ../hello.txt .')
291
assert exists('./hello.txt')
292
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
293
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
294
runbzr(['commit', '-m', 'move to parent directory'])
296
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
298
runbzr('move sub2/hello.txt .')
299
assert exists('hello.txt')
431
301
f = file('hello.txt', 'wt')
432
302
f.write('some nice new content\n')
435
self.run_bzr("add hello.txt")
437
305
f = file('msg.tmp', 'wt')
438
f.write('this is my new commit\nand it has multiple lines, for fun')
306
f.write('this is my new commit\n')
441
self.run_bzr('commit -F msg.tmp')
443
self.assertEquals(self.run_bzr('revno')[0], '1\n')
444
self.run_bzr('export -r 1 export-1.tmp')
445
self.run_bzr('export export.tmp')
448
self.run_bzr('log -v')
449
self.run_bzr('log -v --forward')
450
self.run_bzr('log -m', retcode=3)
451
log_out = self.run_bzr('log -m commit')[0]
452
self.assert_("this is my new commit\n and" in log_out)
453
self.assert_("rename nested" not in log_out)
454
self.assert_('revision-id' not in log_out)
455
self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
457
log_out = self.run_bzr('log --line')[0]
458
# determine the widest line we want
459
max_width = terminal_width() - 1
460
for line in log_out.splitlines():
461
self.assert_(len(line) <= max_width, len(line))
462
self.assert_("this is my new commit and" not in log_out)
463
self.assert_("this is my new commit" in log_out)
309
runbzr('commit -F msg.tmp')
311
assert backtick('bzr revno') == '5\n'
312
runbzr('export -r 5 export-5.tmp')
313
runbzr('export export.tmp')
317
runbzr('log -v --forward')
318
runbzr('log -m', retcode=1)
319
log_out = backtick('bzr log -m commit')
320
assert "this is my new commit" in log_out
321
assert "rename nested" not in log_out
322
assert 'revision-id' not in log_out
323
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
465
326
progress("file with spaces in name")
466
327
mkdir('sub directory')
467
328
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
468
self.run_bzr('add .')
469
self.run_bzr('diff', retcode=1)
470
self.run_bzr('commit -m add-spaces')
471
self.run_bzr('check')
474
self.run_bzr('log --forward')
483
os.symlink("NOWHERE1", "link1")
484
self.run_bzr('add link1')
485
self.assertEquals(self.run_bzr('unknowns')[0], '')
486
self.run_bzr(['commit', '-m', '1: added symlink link1'])
489
self.run_bzr('add d1')
490
self.assertEquals(self.run_bzr('unknowns')[0], '')
491
os.symlink("NOWHERE2", "d1/link2")
492
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
493
# is d1/link2 found when adding d1
494
self.run_bzr('add d1')
495
self.assertEquals(self.run_bzr('unknowns')[0], '')
496
os.symlink("NOWHERE3", "d1/link3")
497
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
498
self.run_bzr(['commit', '-m', '2: added dir, symlink'])
500
self.run_bzr('rename d1 d2')
501
self.run_bzr('move d2/link2 .')
502
self.run_bzr('move link1 d2')
503
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
504
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
505
self.run_bzr('add d2/link3')
506
self.run_bzr('diff', retcode=1)
507
self.run_bzr(['commit', '-m',
508
'3: rename of dir, move symlinks, add link3'])
511
os.symlink("TARGET 2", "link2")
512
os.unlink("d2/link1")
513
os.symlink("TARGET 1", "d2/link1")
514
self.run_bzr('diff', retcode=1)
515
self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
516
self.run_bzr(['commit', '-m', '4: retarget of two links'])
518
self.run_bzr('remove --keep d2/link1')
519
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
520
self.run_bzr(['commit', '-m', '5: remove d2/link1'])
521
# try with the rm alias
522
self.run_bzr('add d2/link1')
523
self.run_bzr(['commit', '-m', '6: add d2/link1'])
524
self.run_bzr('rm --keep d2/link1')
525
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
526
self.run_bzr(['commit', '-m', '7: remove d2/link1'])
529
self.run_bzr('add d1')
530
self.run_bzr('rename d2/link3 d1/link3new')
531
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
532
self.run_bzr(['commit', '-m',
533
'8: remove d2/link1, move/rename link3'])
535
self.run_bzr('check')
537
self.run_bzr('export -r 1 exp1.tmp')
539
self.assertEquals(listdir_sorted("."), [ "link1" ])
540
self.assertEquals(os.readlink("link1"), "NOWHERE1")
543
self.run_bzr('export -r 2 exp2.tmp')
545
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
548
self.run_bzr('export -r 3 exp3.tmp')
550
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
551
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
552
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
553
self.assertEquals(os.readlink("link2") , "NOWHERE2")
556
self.run_bzr('export -r 4 exp4.tmp')
558
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
559
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
560
self.assertEquals(os.readlink("link2") , "TARGET 2")
561
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
564
self.run_bzr('export -r 5 exp5.tmp')
566
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
567
self.assert_(os.path.islink("link2"))
568
self.assert_(listdir_sorted("d2")== [ "link3" ])
571
self.run_bzr('export -r 8 exp6.tmp')
573
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
574
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
575
self.assertEquals(listdir_sorted("d2"), [])
576
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
579
progress("skipping symlink tests")
582
class RemoteTests(object):
583
"""Test bzr ui commands against remote branches."""
585
def test_branch(self):
587
wt = self.make_branch_and_tree('from')
589
wt.commit('empty commit for nonsense', allow_pointless=True)
590
url = self.get_readonly_url('from')
591
self.run_bzr(['branch', url, 'to'])
592
branch = Branch.open('to')
593
self.assertEqual(1, len(branch.revision_history()))
594
# the branch should be set in to to from
595
self.assertEqual(url + '/', branch.get_parent())
598
self.build_tree(['branch/', 'branch/file'])
599
self.run_bzr('init branch')[0]
600
self.run_bzr('add branch/file')[0]
601
self.run_bzr('commit -m foo branch')[0]
602
url = self.get_readonly_url('branch/file')
603
output = self.run_bzr('log %s' % url)[0]
604
self.assertEqual(8, len(output.split('\n')))
331
runbzr('commit -m add-spaces')
335
runbzr('log --forward')
347
assert os.path.exists('branch1')
348
assert not os.path.exists('branch2')
349
# Can't create a branch if it already exists
350
runbzr('branch branch1', retcode=1)
351
# Can't create a branch if its parent doesn't exist
352
runbzr('branch /unlikely/to/exist', retcode=1)
353
runbzr('branch branch1 branch2')
354
assert exists('branch2')
355
assert exists('branch2/sub1')
356
assert exists('branch2/sub1/hello.txt')
606
def test_check(self):
607
self.build_tree(['branch/', 'branch/file'])
608
self.run_bzr('init branch')[0]
609
self.run_bzr('add branch/file')[0]
610
self.run_bzr('commit -m foo branch')[0]
611
url = self.get_readonly_url('branch/')
612
self.run_bzr(['check', url])
615
# create a source branch
616
os.mkdir('my-branch')
617
os.chdir('my-branch')
358
runbzr('branch --revision 0 branch1 branch3')
359
assert not exists('branch3/sub1/hello.txt')
360
runbzr('branch --revision 0..3 branch1 branch4', retcode=1)
364
runbzr('pull', retcode=1)
365
runbzr('pull ../branch2')
368
runbzr('commit --unchanged -m empty')
370
chdir('../../branch2')
372
runbzr('commit --unchanged -m empty')
374
runbzr('commit --unchanged -m empty')
375
runbzr('pull', retcode=1)
378
progress('status after remove')
379
mkdir('status-after-remove')
380
# see mail from William Dodé, 2005-05-25
381
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
382
# * looking for changes...
387
# bzr: local variable 'kind' referenced before assignment
388
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
389
# see ~/.bzr.log for debug information
390
chdir('status-after-remove')
392
file('a', 'w').write('foo')
394
runbzr(['commit', '-m', 'add a'])
402
progress("recursive and non-recursive add")
407
fp = os.path.join('foo', 'test.txt')
411
runbzr('add --no-recurse foo')
412
runbzr('file-id foo')
413
runbzr('file-id ' + fp, 1) # not versioned yet
414
runbzr('commit -m add-dir-only')
416
self.runbzr('file-id ' + fp, 1) # still not versioned
418
self.runbzr('add foo')
419
self.runbzr('file-id ' + fp)
420
self.runbzr('commit -m add-sub-file')
426
class RevertCommand(ExternalBase):
619
430
file('hello', 'wt').write('foo')
620
self.run_bzr('add hello')
621
self.run_bzr('commit -m setup')
623
# with an explicit target work
624
self.run_bzr(['push', self.get_url('output-branch')])
627
class HTTPTests(TestCaseWithWebserver, RemoteTests):
628
"""Test various commands against a HTTP server."""
631
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
632
"""Test various commands against a SFTP server using abs paths."""
635
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
636
"""Test various commands against a SFTP server using abs paths."""
639
super(SFTPTestsAbsoluteSibling, self).setUp()
640
self._override_home = '/dev/noone/runs/tests/here'
643
class SFTPTestsRelative(TestCaseWithSFTPServer, RemoteTests):
644
"""Test various commands against a SFTP server using homedir rel paths."""
647
super(SFTPTestsRelative, self).setUp()
648
self._get_remote_is_absolute = False
431
self.runbzr('add hello')
432
self.runbzr('commit -m setup hello')
434
file('hello', 'wt').write('bar')
435
self.runbzr('revert hello')
436
self.check_file_contents('hello', 'foo')
added
removed
bzrlib/selftest/blackbox.py
