1
# Copyright (C) 2005-2011 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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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.tests.http_utils import TestCaseWithWebserver
48
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
49
from bzrlib.tests import TestCaseWithTransport
50
from bzrlib.workingtree import WorkingTree
53
class TestCommands(TestCaseWithTransport):
55
def test_invalid_commands(self):
56
self.run_bzr("pants", retcode=3)
57
self.run_bzr("--pants off", retcode=3)
58
self.run_bzr("diff --message foo", retcode=3)
60
def test_revert(self):
63
with file('hello', 'wt') as f: f.write('foo')
64
self.run_bzr('add hello')
65
self.run_bzr('commit -m setup hello')
67
with file('goodbye', 'wt') as f: f.write('baz')
68
self.run_bzr('add goodbye')
69
self.run_bzr('commit -m setup goodbye')
71
with file('hello', 'wt') as f: f.write('bar')
72
with file('goodbye', 'wt') as f: f.write('qux')
73
self.run_bzr('revert hello')
74
self.check_file_contents('hello', 'foo')
75
self.check_file_contents('goodbye', 'qux')
76
self.run_bzr('revert')
77
self.check_file_contents('goodbye', 'baz')
80
self.run_bzr('add revertdir')
81
self.run_bzr('commit -m f')
83
self.run_bzr('revert')
85
if osutils.has_symlinks():
86
os.symlink('/unlikely/to/exist', 'symlink')
87
self.run_bzr('add symlink')
88
self.run_bzr('commit -m f')
90
self.run_bzr('revert')
91
self.assertPathExists('symlink')
93
os.symlink('a-different-path', 'symlink')
94
self.run_bzr('revert')
95
self.assertEqual('/unlikely/to/exist',
96
os.readlink('symlink'))
98
self.log("skipping revert symlink tests")
100
with file('hello', 'wt') as f: f.write('xyz')
101
self.run_bzr('commit -m xyz hello')
102
self.run_bzr('revert -r 1 hello')
103
self.check_file_contents('hello', 'foo')
104
self.run_bzr('revert hello')
105
self.check_file_contents('hello', 'xyz')
106
os.chdir('revertdir')
107
self.run_bzr('revert')
110
def example_branch(test):
112
with file('hello', 'wt') as f: f.write('foo')
113
test.run_bzr('add hello')
114
test.run_bzr('commit -m setup hello')
115
with file('goodbye', 'wt') as f: f.write('baz')
116
test.run_bzr('add goodbye')
117
test.run_bzr('commit -m setup goodbye')
119
def test_pull_verbose(self):
120
"""Pull changes from one branch to another and watch the output."""
125
self.example_branch()
128
self.run_bzr('branch a b')
130
with open('b', 'wb') as f: f.write('else\n')
131
self.run_bzr('add b')
132
self.run_bzr(['commit', '-m', 'added b'])
135
out = self.run_bzr('pull --verbose ../b')[0]
136
self.assertNotEqual(out.find('Added Revisions:'), -1)
137
self.assertNotEqual(out.find('message:\n added b'), -1)
138
self.assertNotEqual(out.find('added b'), -1)
140
# Check that --overwrite --verbose prints out the removed entries
141
self.run_bzr('commit -m foo --unchanged')
143
self.run_bzr('commit -m baz --unchanged')
144
self.run_bzr('pull ../a', retcode=3)
145
out = self.run_bzr('pull --overwrite --verbose ../a')[0]
147
remove_loc = out.find('Removed Revisions:')
148
self.assertNotEqual(remove_loc, -1)
149
added_loc = out.find('Added Revisions:')
150
self.assertNotEqual(added_loc, -1)
152
removed_message = out.find('message:\n baz')
153
self.assertNotEqual(removed_message, -1)
154
self.assertTrue(remove_loc < removed_message < added_loc)
156
added_message = out.find('message:\n foo')
157
self.assertNotEqual(added_message, -1)
158
self.assertTrue(added_loc < added_message)
160
def test_locations(self):
161
"""Using and remembering different locations"""
165
self.run_bzr('commit -m unchanged --unchanged')
166
self.run_bzr('pull', retcode=3)
167
self.run_bzr('merge', retcode=3)
168
self.run_bzr('branch . ../b')
171
self.run_bzr('branch . ../c')
172
self.run_bzr('pull ../c')
173
self.run_bzr('merge')
175
self.run_bzr('pull ../b')
177
self.run_bzr('pull ../c')
178
self.run_bzr('branch ../c ../d')
179
osutils.rmtree('../c')
184
self.run_bzr('pull', retcode=3)
185
self.run_bzr('pull ../a --remember')
188
def test_unknown_command(self):
189
"""Handling of unknown command."""
190
out, err = self.run_bzr('fluffy-badger', retcode=3)
191
self.assertEquals(out, '')
192
err.index('unknown command')
194
def create_conflicts(self):
195
"""Create a conflicted tree"""
198
with file('hello', 'wb') as f: f.write("hi world")
199
with file('answer', 'wb') as f: f.write("42")
202
self.run_bzr('commit -m base')
203
self.run_bzr('branch . ../other')
204
self.run_bzr('branch . ../this')
206
with file('hello', 'wb') as f: f.write("Hello.")
207
with file('answer', 'wb') as f: f.write("Is anyone there?")
208
self.run_bzr('commit -m other')
210
with file('hello', 'wb') as f: f.write("Hello, world")
211
self.run_bzr('mv answer question')
212
with file('question', 'wb') as f: f.write("What do you get when you multiply six"
214
self.run_bzr('commit -m this')
216
def test_status(self):
220
self.run_bzr('commit --unchanged --message f')
221
self.run_bzr('branch . ../branch2')
222
self.run_bzr('branch . ../branch3')
223
self.run_bzr('commit --unchanged --message peter')
224
os.chdir('../branch2')
225
self.run_bzr('merge ../branch1')
226
self.run_bzr('commit --unchanged --message pumpkin')
227
os.chdir('../branch3')
228
self.run_bzr('merge ../branch2')
229
message = self.run_bzr('status')[0]
232
def test_conflicts(self):
233
"""Handling of merge conflicts"""
234
self.create_conflicts()
235
self.run_bzr('merge ../other --show-base', retcode=1)
236
conflict_text = file('hello').read()
237
self.assert_('<<<<<<<' in conflict_text)
238
self.assert_('>>>>>>>' in conflict_text)
239
self.assert_('=======' in conflict_text)
240
self.assert_('|||||||' in conflict_text)
241
self.assert_('hi world' in conflict_text)
242
self.run_bzr('revert')
243
self.run_bzr('resolve --all')
244
self.run_bzr('merge ../other', retcode=1)
245
conflict_text = file('hello').read()
246
self.assert_('|||||||' not in conflict_text)
247
self.assert_('hi world' not in conflict_text)
248
result = self.run_bzr('conflicts')[0]
249
self.assertEquals(result, "Text conflict in hello\nText conflict in"
251
result = self.run_bzr('status')[0]
252
self.assert_("conflicts:\n Text conflict in hello\n"
253
" Text conflict in question\n" in result, result)
254
self.run_bzr('resolve hello')
255
result = self.run_bzr('conflicts')[0]
256
self.assertEquals(result, "Text conflict in question\n")
257
self.run_bzr('commit -m conflicts', retcode=3)
258
self.run_bzr('resolve --all')
259
result = self.run_bzr('conflicts')[0]
260
self.run_bzr('commit -m conflicts')
261
self.assertEquals(result, "")
264
# create a source branch
265
os.mkdir('my-branch')
266
os.chdir('my-branch')
267
self.example_branch()
269
# with no push target, fail
270
self.run_bzr('push', retcode=3)
271
# with an explicit target work
272
self.run_bzr('push ../output-branch')
273
# with an implicit target work
276
self.run_bzr('missing ../output-branch')
277
# advance this branch
278
self.run_bzr('commit --unchanged -m unchanged')
280
os.chdir('../output-branch')
281
# There is no longer a difference as long as we have
282
# access to the working tree
285
# But we should be missing a revision
286
self.run_bzr('missing ../my-branch', retcode=1)
288
# diverge the branches
289
self.run_bzr('commit --unchanged -m unchanged')
290
os.chdir('../my-branch')
292
self.run_bzr('push', retcode=3)
293
# and there are difference
294
self.run_bzr('missing ../output-branch', retcode=1)
295
self.run_bzr('missing --verbose ../output-branch', retcode=1)
296
# but we can force a push
297
self.run_bzr('push --overwrite')
299
self.run_bzr('missing ../output-branch')
301
# pushing to a new dir with no parent should fail
302
self.run_bzr('push ../missing/new-branch', retcode=3)
303
# unless we provide --create-prefix
304
self.run_bzr('push --create-prefix ../missing/new-branch')
306
self.run_bzr('missing ../missing/new-branch')
308
def test_external_command(self):
309
"""Test that external commands can be run by setting the path
311
# We don't at present run bzr in a subprocess for blackbox tests, and so
312
# don't really capture stdout, only the internal python stream.
313
# Therefore we don't use a subcommand that produces any output or does
314
# anything -- we just check that it can be run successfully.
315
cmd_name = 'test-command'
316
if sys.platform == 'win32':
318
self.overrideEnv('BZRPATH', None)
320
f = file(cmd_name, 'wb')
321
if sys.platform == 'win32':
322
f.write('@echo off\n')
324
f.write('#!/bin/sh\n')
325
# f.write('echo Hello from test-command')
327
os.chmod(cmd_name, 0755)
329
# It should not find the command in the local
330
# directory by default, since it is not in my path
331
self.run_bzr(cmd_name, retcode=3)
333
# Now put it into my path
334
self.overrideEnv('BZRPATH', '.')
335
self.run_bzr(cmd_name)
337
# Make sure empty path elements are ignored
338
self.overrideEnv('BZRPATH', os.pathsep)
339
self.run_bzr(cmd_name, retcode=3)
342
def listdir_sorted(dir):
348
class OldTests(TestCaseWithTransport):
349
"""old tests moved from ./testbzr."""
29
# this code was previously in testbzr
31
from unittest import TestCase
32
from bzrlib.selftest import TestBase, InTempDir
36
class ExternalBase(InTempDir):
37
def runbzr(self, args, retcode=0):
40
from subprocess import call
41
except ImportError, e:
45
if isinstance(args, basestring):
48
return self.runcmd(['python', self.BZRPATH,] + args,
53
class TestVersion(ExternalBase):
55
# output is intentionally passed through to stdout so that we
56
# can see the version being tested
57
self.runbzr(['version'])
61
class HelpCommands(ExternalBase):
65
self.runbzr('help commands')
66
self.runbzr('help help')
67
self.runbzr('commit -h')
70
class InitBranch(ExternalBase):
77
class UserIdentity(ExternalBase):
79
# this should always identify something, if only "john@localhost"
81
self.runbzr("whoami --email")
82
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
86
class InvalidCommands(ExternalBase):
88
self.runbzr("pants", retcode=1)
89
self.runbzr("--pants off", retcode=1)
90
self.runbzr("diff --message foo", retcode=1)
94
class EmptyCommit(ExternalBase):
97
self.build_tree(['hello.txt'])
98
self.runbzr("commit -m empty", retcode=1)
99
self.runbzr("add hello.txt")
100
self.runbzr("commit -m added")
104
class IgnorePatterns(ExternalBase):
106
from bzrlib.branch import Branch
108
b = Branch('.', init=True)
109
self.assertEquals(list(b.unknowns()), [])
111
file('foo.tmp', 'wt').write('tmp files are ignored')
112
self.assertEquals(list(b.unknowns()), [])
113
assert self.backtick('bzr unknowns') == ''
115
file('foo.c', 'wt').write('int main() {}')
116
self.assertEquals(list(b.unknowns()), ['foo.c'])
117
assert self.backtick('bzr unknowns') == 'foo.c\n'
119
self.runbzr(['add', 'foo.c'])
120
assert self.backtick('bzr unknowns') == ''
122
# 'ignore' works when creating the .bzignore file
123
file('foo.blah', 'wt').write('blah')
124
self.assertEquals(list(b.unknowns()), ['foo.blah'])
125
self.runbzr('ignore *.blah')
126
self.assertEquals(list(b.unknowns()), [])
127
assert file('.bzrignore', 'rb').read() == '*.blah\n'
129
# 'ignore' works when then .bzrignore file already exists
130
file('garh', 'wt').write('garh')
131
self.assertEquals(list(b.unknowns()), ['garh'])
132
assert self.backtick('bzr unknowns') == 'garh\n'
133
self.runbzr('ignore garh')
134
self.assertEquals(list(b.unknowns()), [])
135
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
140
class OldTests(ExternalBase):
141
# old tests moved from ./testbzr
352
143
from os import chdir, mkdir
353
144
from os.path import exists
148
backtick = self.backtick
355
149
progress = self.log
357
151
progress("basic branch creation")
362
self.assertIsSameRealPath(self.run_bzr('root')[0].rstrip(),
363
osutils.pathjoin(self.test_dir, 'branch1'))
156
self.assertEquals(backtick('bzr root').rstrip(),
157
os.path.join(self.test_dir, 'branch1'))
365
159
progress("status of new file")
368
162
f.write('hello world!\n')
371
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
373
out = self.run_bzr("status")[0]
374
self.assertEquals(out, 'unknown:\n test.txt\n')
165
out = backtick("bzr unknowns")
166
self.assertEquals(out, 'test.txt\n')
168
out = backtick("bzr status")
169
assert out == 'unknown:\n test.txt\n'
171
out = backtick("bzr status --all")
172
assert out == "unknown:\n test.txt\n"
174
out = backtick("bzr status test.txt --all")
175
assert out == "unknown:\n test.txt\n"
376
177
f = file('test2.txt', 'wt')
377
178
f.write('goodbye cruel world...\n')
380
out = self.run_bzr("status test.txt")[0]
381
self.assertEquals(out, "unknown:\n test.txt\n")
181
out = backtick("bzr status test.txt")
182
assert out == "unknown:\n test.txt\n"
383
out = self.run_bzr("status")[0]
384
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
184
out = backtick("bzr status")
185
assert out == ("unknown:\n"
386
189
os.unlink('test2.txt')
388
191
progress("command aliases")
389
out = self.run_bzr("st")[0]
390
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
192
out = backtick("bzr st --all")
193
assert out == ("unknown:\n"
392
out = self.run_bzr("stat")[0]
393
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
196
out = backtick("bzr stat")
197
assert out == ("unknown:\n"
395
200
progress("command help")
396
self.run_bzr("help st")
398
self.run_bzr("help commands")
399
self.run_bzr("help slartibartfast", retcode=3)
401
out = self.run_bzr("help ci")[0]
402
out.index('Aliases: ci, checkin\n')
203
runbzr("help commands")
204
runbzr("help slartibartfast", 1)
206
out = backtick("bzr help ci")
207
out.index('aliases: ')
209
progress("can't rename unversioned file")
210
runbzr("rename test.txt new-test.txt", 1)
212
progress("adding a file")
214
runbzr("add test.txt")
215
assert backtick("bzr unknowns") == ''
216
assert backtick("bzr status --all") == ("added:\n"
219
progress("rename newly-added file")
220
runbzr("rename test.txt hello.txt")
221
assert os.path.exists("hello.txt")
222
assert not os.path.exists("test.txt")
224
assert backtick("bzr revno") == '0\n'
226
progress("add first revision")
227
runbzr(['commit', '-m', 'add first revision'])
229
progress("more complex renames")
231
runbzr("rename hello.txt sub1", 1)
232
runbzr("rename hello.txt sub1/hello.txt", 1)
233
runbzr("move hello.txt sub1", 1)
236
runbzr("rename sub1 sub2")
237
runbzr("move hello.txt sub2")
238
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
240
assert exists("sub2")
241
assert exists("sub2/hello.txt")
242
assert not exists("sub1")
243
assert not exists("hello.txt")
245
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
249
runbzr('move sub2/hello.txt sub1')
250
assert not exists('sub2/hello.txt')
251
assert exists('sub1/hello.txt')
252
runbzr('move sub2 sub1')
253
assert not exists('sub2')
254
assert exists('sub1/sub2')
256
runbzr(['commit', '-m', 'rename nested subdirectories'])
259
self.assertEquals(backtick('bzr root')[:-1],
260
os.path.join(self.test_dir, 'branch1'))
261
runbzr('move ../hello.txt .')
262
assert exists('./hello.txt')
263
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
264
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
265
runbzr(['commit', '-m', 'move to parent directory'])
267
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
269
runbzr('move sub2/hello.txt .')
270
assert exists('hello.txt')
404
272
f = file('hello.txt', 'wt')
405
273
f.write('some nice new content\n')
408
self.run_bzr("add hello.txt")
410
276
f = file('msg.tmp', 'wt')
411
f.write('this is my new commit\nand it has multiple lines, for fun')
277
f.write('this is my new commit\n')
414
self.run_bzr('commit -F msg.tmp')
416
self.assertEquals(self.run_bzr('revno')[0], '1\n')
417
self.run_bzr('export -r 1 export-1.tmp')
418
self.run_bzr('export export.tmp')
421
self.run_bzr('log -v')
422
self.run_bzr('log -v --forward')
423
self.run_bzr('log -m', retcode=3)
424
log_out = self.run_bzr('log -m commit')[0]
425
self.assert_("this is my new commit\n and" in log_out)
426
self.assert_("rename nested" not in log_out)
427
self.assert_('revision-id' not in log_out)
428
self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
430
log_out = self.run_bzr('log --line')[0]
431
# determine the widest line we want
432
max_width = osutils.terminal_width()
433
if max_width is not None:
434
for line in log_out.splitlines():
435
self.assert_(len(line) <= max_width - 1, len(line))
436
self.assert_("this is my new commit and" not in log_out)
437
self.assert_("this is my new commit" in log_out)
280
runbzr('commit -F msg.tmp')
282
assert backtick('bzr revno') == '5\n'
283
runbzr('export -r 5 export-5.tmp')
284
runbzr('export export.tmp')
288
runbzr('log -v --forward')
289
runbzr('log -m', retcode=1)
290
log_out = backtick('bzr log -m commit')
291
assert "this is my new commit" in log_out
292
assert "rename nested" not in log_out
293
assert 'revision-id' not in log_out
294
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
439
297
progress("file with spaces in name")
440
298
mkdir('sub directory')
441
with file('sub directory/file with spaces ', 'wt') as f: f.write('see how this works\n')
442
self.run_bzr('add .')
443
self.run_bzr('diff', retcode=1)
444
self.run_bzr('commit -m add-spaces')
445
self.run_bzr('check')
448
self.run_bzr('log --forward')
452
if osutils.has_symlinks():
457
os.symlink("NOWHERE1", "link1")
458
self.run_bzr('add link1')
459
self.assertEquals(self.run_bzr('unknowns')[0], '')
460
self.run_bzr(['commit', '-m', '1: added symlink link1'])
463
self.run_bzr('add d1')
464
self.assertEquals(self.run_bzr('unknowns')[0], '')
465
os.symlink("NOWHERE2", "d1/link2")
466
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
467
# is d1/link2 found when adding d1
468
self.run_bzr('add d1')
469
self.assertEquals(self.run_bzr('unknowns')[0], '')
470
os.symlink("NOWHERE3", "d1/link3")
471
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
472
self.run_bzr(['commit', '-m', '2: added dir, symlink'])
474
self.run_bzr('rename d1 d2')
475
self.run_bzr('move d2/link2 .')
476
self.run_bzr('move link1 d2')
477
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
478
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
479
self.run_bzr('add d2/link3')
480
self.run_bzr('diff', retcode=1)
481
self.run_bzr(['commit', '-m',
482
'3: rename of dir, move symlinks, add link3'])
485
os.symlink("TARGET 2", "link2")
486
os.unlink("d2/link1")
487
os.symlink("TARGET 1", "d2/link1")
488
self.run_bzr('diff', retcode=1)
489
self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
490
self.run_bzr(['commit', '-m', '4: retarget of two links'])
492
self.run_bzr('remove --keep d2/link1')
493
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
494
self.run_bzr(['commit', '-m', '5: remove d2/link1'])
495
# try with the rm alias
496
self.run_bzr('add d2/link1')
497
self.run_bzr(['commit', '-m', '6: add d2/link1'])
498
self.run_bzr('rm --keep d2/link1')
499
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
500
self.run_bzr(['commit', '-m', '7: remove d2/link1'])
503
self.run_bzr('add d1')
504
self.run_bzr('rename d2/link3 d1/link3new')
505
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
506
self.run_bzr(['commit', '-m',
507
'8: remove d2/link1, move/rename link3'])
509
self.run_bzr('check')
511
self.run_bzr('export -r 1 exp1.tmp')
513
self.assertEquals(listdir_sorted("."), [ "link1" ])
514
self.assertEquals(os.readlink("link1"), "NOWHERE1")
517
self.run_bzr('export -r 2 exp2.tmp')
519
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
522
self.run_bzr('export -r 3 exp3.tmp')
524
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
525
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
526
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
527
self.assertEquals(os.readlink("link2") , "NOWHERE2")
530
self.run_bzr('export -r 4 exp4.tmp')
532
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
533
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
534
self.assertEquals(os.readlink("link2") , "TARGET 2")
535
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
538
self.run_bzr('export -r 5 exp5.tmp')
540
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
541
self.assert_(os.path.islink("link2"))
542
self.assert_(listdir_sorted("d2")== [ "link3" ])
545
self.run_bzr('export -r 8 exp6.tmp')
547
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
548
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
549
self.assertEquals(listdir_sorted("d2"), [])
550
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
553
progress("skipping symlink tests")
556
class RemoteTests(object):
557
"""Test bzr ui commands against remote branches."""
559
def test_branch(self):
561
wt = self.make_branch_and_tree('from')
563
wt.commit('empty commit for nonsense', allow_pointless=True)
564
url = self.get_readonly_url('from')
565
self.run_bzr(['branch', url, 'to'])
566
branch = Branch.open('to')
567
self.assertEqual(1, branch.last_revision_info()[0])
568
# the branch should be set in to to from
569
self.assertEqual(url + '/', branch.get_parent())
572
self.build_tree(['branch/', 'branch/file'])
573
self.run_bzr('init branch')[0]
574
self.run_bzr('add branch/file')[0]
575
self.run_bzr('commit -m foo branch')[0]
576
url = self.get_readonly_url('branch/file')
577
output = self.run_bzr('log %s' % url)[0]
578
self.assertEqual(8, len(output.split('\n')))
580
def test_check(self):
581
self.build_tree(['branch/', 'branch/file'])
582
self.run_bzr('init branch')[0]
583
self.run_bzr('add branch/file')[0]
584
self.run_bzr('commit -m foo branch')[0]
585
url = self.get_readonly_url('branch/')
586
self.run_bzr(['check', url])
589
# create a source branch
590
os.mkdir('my-branch')
591
os.chdir('my-branch')
593
with file('hello', 'wt') as f: f.write('foo')
594
self.run_bzr('add hello')
595
self.run_bzr('commit -m setup')
597
# with an explicit target work
598
self.run_bzr(['push', self.get_url('output-branch')])
601
class HTTPTests(TestCaseWithWebserver, RemoteTests):
602
"""Test various commands against a HTTP server."""
605
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
606
"""Test various commands against a SFTP server using abs paths."""
609
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
610
"""Test various commands against a SFTP server using abs paths."""
613
super(SFTPTestsAbsoluteSibling, self).setUp()
614
self._override_home = '/dev/noone/runs/tests/here'
617
class SFTPTestsRelative(TestCaseWithSFTPServer, RemoteTests):
618
"""Test various commands against a SFTP server using homedir rel paths."""
621
super(SFTPTestsRelative, self).setUp()
622
self._get_remote_is_absolute = False
299
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
302
runbzr('commit -m add-spaces')
306
runbzr('log --forward')
318
assert os.path.exists('branch1')
319
assert not os.path.exists('branch2')
320
# Can't create a branch if it already exists
321
runbzr('branch branch1', retcode=1)
322
# Can't create a branch if its parent doesn't exist
323
runbzr('branch /unlikely/to/exist', retcode=1)
324
runbzr('branch branch1 branch2')
325
assert exists('branch2')
326
assert exists('branch2/sub1')
327
assert exists('branch2/sub1/hello.txt')
329
runbzr('branch --revision 0 branch1 branch3')
330
assert not exists('branch3/sub1/hello.txt')
331
runbzr('branch --revision 0..3 branch1 branch4', retcode=1)
335
runbzr('pull', retcode=1)
336
runbzr('pull ../branch2')
339
runbzr('commit --unchanged -m empty')
341
chdir('../../branch2')
343
runbzr('commit --unchanged -m empty')
345
runbzr('commit --unchanged -m empty')
346
runbzr('pull', retcode=1)
349
progress('status after remove')
350
mkdir('status-after-remove')
351
# see mail from William Dodé, 2005-05-25
352
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
353
# * looking for changes...
358
# bzr: local variable 'kind' referenced before assignment
359
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
360
# see ~/.bzr.log for debug information
361
chdir('status-after-remove')
363
file('a', 'w').write('foo')
365
runbzr(['commit', '-m', 'add a'])
373
progress("recursive and non-recursive add")
378
fp = os.path.join('foo', 'test.txt')
382
runbzr('add --no-recurse foo')
383
runbzr('file-id foo')
384
runbzr('file-id ' + fp, 1) # not versioned yet
385
runbzr('commit -m add-dir-only')
387
self.runbzr('file-id ' + fp, 1) # still not versioned
389
self.runbzr('add foo')
390
self.runbzr('file-id ' + fp)
391
self.runbzr('commit -m add-sub-file')
397
class RevertCommand(ExternalBase):
401
file('hello', 'wt').write('foo')
402
self.runbzr('add hello')
403
self.runbzr('commit -m setup hello')
405
file('hello', 'wt').write('bar')
406
self.runbzr('revert hello')
407
self.check_file_contents('hello', 'foo')
added
removed
bzrlib/selftest/blackbox.py
