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
# 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
22
command-line interface. This doesn't actually run a new interpreter but
26
23
rather starts again from the run_bzr function.
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
27
from cStringIO import StringIO
45
33
from bzrlib.branch import Branch
34
from bzrlib.clone import copy_branch
46
35
from bzrlib.errors import BzrCommandError
47
from bzrlib.osutils import (
52
from bzrlib.tests.http_utils 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):
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
60
96
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)
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_other_branch_commit(self):
115
# this branch is to ensure consistent behaviour, whether we're run
116
# inside a branch, or not.
117
os.mkdir('empty_branch')
118
os.chdir('empty_branch')
123
file('foo.c', 'wt').write('int main() {}')
124
file('bar.c', 'wt').write('int main() {}')
126
self.runbzr(['add', 'branch/foo.c'])
127
self.runbzr(['add', 'branch'])
128
# can't commit files in different trees; sane error
129
self.runbzr('commit -m newstuff branch/foo.c .', retcode=1)
130
self.runbzr('commit -m newstuff branch/foo.c')
131
self.runbzr('commit -m newstuff branch')
132
self.runbzr('commit -m newstuff branch', retcode=1)
135
def test_ignore_patterns(self):
136
from bzrlib.branch import Branch
138
b = Branch.initialize('.')
139
self.assertEquals(list(b.unknowns()), [])
141
file('foo.tmp', 'wt').write('tmp files are ignored')
142
self.assertEquals(list(b.unknowns()), [])
143
assert self.capture('unknowns') == ''
145
file('foo.c', 'wt').write('int main() {}')
146
self.assertEquals(list(b.unknowns()), ['foo.c'])
147
assert self.capture('unknowns') == 'foo.c\n'
149
self.runbzr(['add', 'foo.c'])
150
assert self.capture('unknowns') == ''
152
# 'ignore' works when creating the .bzignore file
153
file('foo.blah', 'wt').write('blah')
154
self.assertEquals(list(b.unknowns()), ['foo.blah'])
155
self.runbzr('ignore *.blah')
156
self.assertEquals(list(b.unknowns()), [])
157
assert file('.bzrignore', 'rU').read() == '*.blah\n'
159
# 'ignore' works when then .bzrignore file already exists
160
file('garh', 'wt').write('garh')
161
self.assertEquals(list(b.unknowns()), ['garh'])
162
assert self.capture('unknowns') == 'garh\n'
163
self.runbzr('ignore garh')
164
self.assertEquals(list(b.unknowns()), [])
165
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
65
167
def test_revert(self):
68
170
file('hello', 'wt').write('foo')
69
self.run_bzr('add hello')
70
self.run_bzr('commit -m setup hello')
171
self.runbzr('add hello')
172
self.runbzr('commit -m setup hello')
72
174
file('goodbye', 'wt').write('baz')
73
self.run_bzr('add goodbye')
74
self.run_bzr('commit -m setup goodbye')
175
self.runbzr('add goodbye')
176
self.runbzr('commit -m setup goodbye')
76
178
file('hello', 'wt').write('bar')
77
179
file('goodbye', 'wt').write('qux')
78
self.run_bzr('revert hello')
180
self.runbzr('revert hello')
79
181
self.check_file_contents('hello', 'foo')
80
182
self.check_file_contents('goodbye', 'qux')
81
self.run_bzr('revert')
183
self.runbzr('revert')
82
184
self.check_file_contents('goodbye', 'baz')
84
186
os.mkdir('revertdir')
85
self.run_bzr('add revertdir')
86
self.run_bzr('commit -m f')
187
self.runbzr('add revertdir')
188
self.runbzr('commit -m f')
87
189
os.rmdir('revertdir')
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")
190
self.runbzr('revert')
192
os.symlink('/unlikely/to/exist', 'symlink')
193
self.runbzr('add symlink')
194
self.runbzr('commit -m f')
196
self.runbzr('revert')
197
self.failUnlessExists('symlink')
199
os.symlink('a-different-path', 'symlink')
200
self.runbzr('revert')
201
self.assertEqual('/unlikely/to/exist',
202
os.readlink('symlink'))
105
204
file('hello', 'wt').write('xyz')
106
self.run_bzr('commit -m xyz hello')
107
self.run_bzr('revert -r 1 hello')
205
self.runbzr('commit -m xyz hello')
206
self.runbzr('revert -r 1 hello')
108
207
self.check_file_contents('hello', 'foo')
109
self.run_bzr('revert hello')
208
self.runbzr('revert hello')
110
209
self.check_file_contents('hello', 'xyz')
111
210
os.chdir('revertdir')
112
self.run_bzr('revert')
211
self.runbzr('revert')
215
def test_mv_modes(self):
216
"""Test two modes of operation for mv"""
217
from bzrlib.branch import Branch
218
b = Branch.initialize('.')
219
self.build_tree(['a', 'c', 'subdir/'])
220
self.run_bzr_captured(['add', self.test_dir])
221
self.run_bzr_captured(['mv', 'a', 'b'])
222
self.run_bzr_captured(['mv', 'b', 'subdir'])
223
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
224
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
225
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
115
227
def test_main_version(self):
116
228
"""Check output from version command and master option is reasonable"""
117
229
# output is intentionally passed through to stdout so that we
118
230
# can see the version being tested
119
output = self.run_bzr('version')[0]
231
output = self.runbzr('version', backtick=1)
120
232
self.log('bzr version output:')
122
self.assert_(output.startswith('Bazaar (bzr) '))
234
self.assert_(output.startswith('bzr (bazaar-ng) '))
123
235
self.assertNotEqual(output.index('Canonical'), -1)
124
236
# make sure --version is consistent
125
tmp_output = self.run_bzr('--version')[0]
237
tmp_output = self.runbzr('--version', backtick=1)
238
self.log('bzr --version output:')
126
240
self.assertEquals(output, tmp_output)
128
242
def example_branch(test):
130
244
file('hello', 'wt').write('foo')
131
test.run_bzr('add hello')
132
test.run_bzr('commit -m setup hello')
245
test.runbzr('add hello')
246
test.runbzr('commit -m setup hello')
133
247
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)
248
test.runbzr('add goodbye')
249
test.runbzr('commit -m setup goodbye')
251
def test_export(self):
254
self.example_branch()
255
self.runbzr('export ../latest')
256
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
257
self.runbzr('export ../first -r 1')
258
assert not os.path.exists('../first/goodbye')
259
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
260
self.runbzr('export ../first.gz -r 1')
261
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
262
self.runbzr('export ../first.bz2 -r 1')
263
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
264
self.runbzr('export ../first.tar -r 1')
265
assert os.path.isfile('../first.tar')
266
from tarfile import TarFile
267
tf = TarFile('../first.tar')
268
assert 'first/hello' in tf.getnames(), tf.getnames()
269
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
270
self.runbzr('export ../first.tar.gz -r 1')
271
assert os.path.isfile('../first.tar.gz')
272
self.runbzr('export ../first.tbz2 -r 1')
273
assert os.path.isfile('../first.tbz2')
274
self.runbzr('export ../first.tar.bz2 -r 1')
275
assert os.path.isfile('../first.tar.bz2')
276
self.runbzr('export ../first.tar.tbz2 -r 1')
277
assert os.path.isfile('../first.tar.tbz2')
278
from bz2 import BZ2File
279
tf = TarFile('../first.tar.tbz2',
280
fileobj=BZ2File('../first.tar.tbz2', 'r'))
281
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
282
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
283
self.runbzr('export ../first2.tar -r 1 --root pizza')
284
tf = TarFile('../first2.tar')
285
assert 'pizza/hello' in tf.getnames(), tf.getnames()
288
self.example_branch()
289
file('hello', 'wt').write('hello world!')
290
self.runbzr('commit -m fixing hello')
291
output = self.runbzr('diff -r 2..3', backtick=1)
292
self.assert_('\n+hello world!' in output)
293
output = self.runbzr('diff -r last:3..last:1', backtick=1)
294
self.assert_('\n+baz' in output)
296
def test_diff_branches(self):
297
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
298
branch = Branch.initialize('branch1')
300
branch.commit('add file')
301
copy_branch(branch, 'branch2')
302
print >> open('branch2/file', 'w'), 'new content'
303
branch2 = Branch.open('branch2')
304
branch2.commit('update file')
305
# should open branch1 and diff against branch2,
306
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
307
self.assertEquals(("=== modified file 'file'\n"
312
"+contents of branch1/file\n"
315
def test_branch(self):
316
"""Branch from one branch to another."""
319
self.example_branch()
321
self.runbzr('branch a b')
322
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
323
self.runbzr('branch a c -r 1')
325
self.runbzr('commit -m foo --unchanged')
327
# naughty - abstraction violations RBC 20050928
328
print "test_branch used to delete the stores, how is this meant to work ?"
329
#shutil.rmtree('a/.bzr/revision-store')
330
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
331
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
332
self.runbzr('branch a d --basis b')
334
def test_merge(self):
335
from bzrlib.branch import Branch
339
self.example_branch()
341
self.runbzr('branch a b')
343
file('goodbye', 'wt').write('quux')
344
self.runbzr(['commit', '-m', "more u's are always good"])
347
file('hello', 'wt').write('quuux')
348
# We can't merge when there are in-tree changes
349
self.runbzr('merge ../b', retcode=1)
350
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
351
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
353
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
354
self.runbzr('revert --no-backup')
355
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
356
self.runbzr('revert --no-backup')
357
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
358
self.runbzr('revert --no-backup')
359
self.runbzr('merge ../b -r last:1')
360
self.check_file_contents('goodbye', 'quux')
361
# Merging a branch pulls its revision into the tree
363
b = Branch.open('../b')
364
a.get_revision_xml(b.last_revision())
365
self.log('pending merges: %s', a.pending_merges())
366
assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
367
% (a.pending_merges(), b.last_patch())
368
self.runbzr('commit -m merged')
369
self.runbzr('merge ../b -r last:1')
370
self.assertEqual(Branch.open('.').pending_merges(), [])
373
def test_merge_with_missing_file(self):
374
"""Merge handles missing file conflicts"""
378
print >> file('sub/a.txt', 'wb'), "hello"
379
print >> file('b.txt', 'wb'), "hello"
380
print >> file('sub/c.txt', 'wb'), "hello"
383
self.runbzr(('commit', '-m', 'added a'))
384
self.runbzr('branch . ../b')
385
print >> file('sub/a.txt', 'ab'), "there"
386
print >> file('b.txt', 'ab'), "there"
387
print >> file('sub/c.txt', 'ab'), "there"
388
self.runbzr(('commit', '-m', 'Added there'))
389
os.unlink('sub/a.txt')
390
os.unlink('sub/c.txt')
393
self.runbzr(('commit', '-m', 'Removed a.txt'))
395
print >> file('sub/a.txt', 'ab'), "something"
396
print >> file('b.txt', 'ab'), "something"
397
print >> file('sub/c.txt', 'ab'), "something"
398
self.runbzr(('commit', '-m', 'Modified a.txt'))
399
self.runbzr('merge ../a/', retcode=1)
400
assert os.path.exists('sub/a.txt.THIS')
401
assert os.path.exists('sub/a.txt.BASE')
403
self.runbzr('merge ../b/', retcode=1)
404
assert os.path.exists('sub/a.txt.OTHER')
405
assert os.path.exists('sub/a.txt.BASE')
408
"""Pull changes from one branch to another."""
412
self.example_branch()
413
self.runbzr('pull', retcode=1)
414
self.runbzr('missing', retcode=1)
415
self.runbzr('missing .')
416
self.runbzr('missing')
418
self.runbzr('pull /', retcode=1)
422
self.runbzr('branch a b')
426
self.runbzr('add subdir')
427
self.runbzr('commit -m blah --unchanged')
430
b = Branch.open('../b')
431
assert a.revision_history() == b.revision_history()[:-1]
432
self.runbzr('pull ../b')
433
assert a.revision_history() == b.revision_history()
434
self.runbzr('commit -m blah2 --unchanged')
436
self.runbzr('commit -m blah3 --unchanged')
438
self.runbzr('pull ../a', retcode=1)
440
self.runbzr('branch b overwriteme')
441
os.chdir('overwriteme')
442
self.runbzr('pull --overwrite ../a')
443
overwritten = Branch.open('.')
444
self.assertEqual(overwritten.revision_history(),
445
a.revision_history())
447
self.runbzr('merge ../b')
448
self.runbzr('commit -m blah4 --unchanged')
449
os.chdir('../b/subdir')
450
self.runbzr('pull ../../a')
451
assert a.revision_history()[-1] == b.revision_history()[-1]
452
self.runbzr('commit -m blah5 --unchanged')
453
self.runbzr('commit -m blah6 --unchanged')
455
self.runbzr('pull ../a')
457
self.runbzr('commit -m blah7 --unchanged')
458
self.runbzr('merge ../b')
459
self.runbzr('commit -m blah8 --unchanged')
460
self.runbzr('pull ../b')
461
self.runbzr('pull ../b')
464
"""Test the abilities of 'bzr ls'"""
466
def bzrout(*args, **kwargs):
467
kwargs['backtick'] = True
468
return self.runbzr(*args, **kwargs)
470
def ls_equals(value, *args):
471
out = self.runbzr(['ls'] + list(args), backtick=True)
472
self.assertEquals(out, value)
475
open('a', 'wb').write('hello\n')
478
bzr('ls --verbose --null', retcode=1)
481
ls_equals('? a\n', '--verbose')
482
ls_equals('a\n', '--unknown')
483
ls_equals('', '--ignored')
484
ls_equals('', '--versioned')
485
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
486
ls_equals('', '--ignored', '--versioned')
487
ls_equals('a\0', '--null')
490
ls_equals('V a\n', '--verbose')
497
open('subdir/b', 'wb').write('b\n')
503
bzr('commit -m subdir')
511
, '--verbose', '--non-recursive')
513
# Check what happens in a sub-directory
525
, '--from-root', '--null')
528
, '--from-root', '--non-recursive')
532
# Check what happens when we supply a specific revision
533
ls_equals('a\n', '--revision', '1')
535
, '--verbose', '--revision', '1')
538
ls_equals('', '--revision', '1')
540
# Now try to do ignored files.
542
open('blah.py', 'wb').write('unknown\n')
543
open('blah.pyo', 'wb').write('ignored\n')
555
ls_equals('blah.pyo\n'
557
ls_equals('blah.py\n'
178
565
def test_locations(self):
179
566
"""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')
570
self.runbzr('commit -m unchanged --unchanged')
571
self.runbzr('pull', retcode=1)
572
self.runbzr('merge', retcode=1)
573
self.runbzr('branch . ../b')
189
self.run_bzr('branch . ../c')
190
self.run_bzr('pull ../c')
191
self.run_bzr('merge')
576
self.runbzr('branch . ../c')
577
self.runbzr('pull ../c')
193
self.run_bzr('pull ../b')
195
self.run_bzr('pull ../c')
196
self.run_bzr('branch ../c ../d')
197
osutils.rmtree('../c')
580
self.runbzr('pull ../b')
582
self.runbzr('pull ../c')
583
self.runbzr('branch ../c ../d')
584
shutil.rmtree('../c')
202
self.run_bzr('pull', retcode=3)
203
self.run_bzr('pull ../a --remember')
589
self.runbzr('pull', retcode=1)
590
self.runbzr('pull ../a --remember')
593
def test_add_reports(self):
594
"""add command prints the names of added files."""
595
b = Branch.initialize('.')
596
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
597
out = self.run_bzr_captured(['add'], retcode = 0)[0]
598
# the ordering is not defined at the moment
599
results = sorted(out.rstrip('\n').split('\n'))
600
self.assertEquals(['added dir',
601
'added dir'+os.sep+'sub.txt',
605
def test_add_quiet_is(self):
606
"""add -q does not print the names of added files."""
607
b = Branch.initialize('.')
608
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
609
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
610
# the ordering is not defined at the moment
611
results = sorted(out.rstrip('\n').split('\n'))
612
self.assertEquals([''], results)
206
614
def test_unknown_command(self):
207
615
"""Handling of unknown command."""
208
out, err = self.run_bzr('fluffy-badger', retcode=3)
616
out, err = self.run_bzr_captured(['fluffy-badger'],
209
618
self.assertEquals(out, '')
210
619
err.index('unknown command')
212
def create_conflicts(self):
213
"""Create a conflicted tree"""
621
def test_conflicts(self):
622
"""Handling of merge conflicts"""
216
625
file('hello', 'wb').write("hi world")
217
626
file('answer', 'wb').write("42")
220
self.run_bzr('commit -m base')
221
self.run_bzr('branch . ../other')
222
self.run_bzr('branch . ../this')
629
self.runbzr('commit -m base')
630
self.runbzr('branch . ../other')
631
self.runbzr('branch . ../this')
223
632
os.chdir('../other')
224
633
file('hello', 'wb').write("Hello.")
225
634
file('answer', 'wb').write("Is anyone there?")
226
self.run_bzr('commit -m other')
635
self.runbzr('commit -m other')
227
636
os.chdir('../this')
228
637
file('hello', 'wb').write("Hello, world")
229
self.run_bzr('mv answer question')
638
self.runbzr('mv answer question')
230
639
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')
641
self.runbzr('commit -m this')
642
self.runbzr('merge ../other --show-base', retcode=1)
643
conflict_text = file('hello').read()
644
assert '<<<<<<<' in conflict_text
645
assert '>>>>>>>' in conflict_text
646
assert '=======' in conflict_text
647
assert '|||||||' in conflict_text
648
assert 'hi world' in conflict_text
649
self.runbzr('revert')
650
self.runbzr('resolve --all')
651
self.runbzr('merge ../other', retcode=1)
652
conflict_text = file('hello').read()
653
assert '|||||||' not in conflict_text
654
assert 'hi world' not in conflict_text
655
result = self.runbzr('conflicts', backtick=1)
656
self.assertEquals(result, "hello\nquestion\n")
657
result = self.runbzr('status', backtick=1)
658
assert "conflicts:\n hello\n question\n" in result, result
659
self.runbzr('resolve hello')
660
result = self.runbzr('conflicts', backtick=1)
661
self.assertEquals(result, "question\n")
662
self.runbzr('commit -m conflicts', retcode=1)
663
self.runbzr('resolve --all')
664
result = self.runbzr('conflicts', backtick=1)
665
self.runbzr('commit -m conflicts')
279
666
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)
366
os.environ['BZRPATH'] = oldpath
668
def test_resign(self):
669
"""Test re signing of data."""
671
oldstrategy = bzrlib.gpg.GPGStrategy
672
branch = Branch.initialize('.')
673
branch.commit("base", allow_pointless=True, rev_id='A')
675
# monkey patch gpg signing mechanism
676
from bzrlib.testament import Testament
677
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
678
self.runbzr('re-sign -r revid:A')
679
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
680
branch.revision_store.get('A', 'sig').read())
682
bzrlib.gpg.GPGStrategy = oldstrategy
684
def test_resign_range(self):
686
oldstrategy = bzrlib.gpg.GPGStrategy
687
branch = Branch.initialize('.')
688
branch.commit("base", allow_pointless=True, rev_id='A')
689
branch.commit("base", allow_pointless=True, rev_id='B')
690
branch.commit("base", allow_pointless=True, rev_id='C')
692
# monkey patch gpg signing mechanism
693
from bzrlib.testament import Testament
694
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
695
self.runbzr('re-sign -r 1..')
696
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
697
branch.revision_store.get('A', 'sig').read())
698
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
699
branch.revision_store.get('B', 'sig').read())
700
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
701
branch.revision_store.get('C', 'sig').read())
703
bzrlib.gpg.GPGStrategy = oldstrategy
369
706
def listdir_sorted(dir):
395
734
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')
737
self.assertEquals(capture('unknowns'), 'test.txt\n')
739
out = capture("status")
740
assert out == 'unknown:\n test.txt\n'
742
out = capture("status --all")
743
assert out == "unknown:\n test.txt\n"
745
out = capture("status test.txt --all")
746
assert out == "unknown:\n test.txt\n"
403
748
f = file('test2.txt', 'wt')
404
749
f.write('goodbye cruel world...\n')
407
out = self.run_bzr("status test.txt")[0]
408
self.assertEquals(out, "unknown:\n test.txt\n")
752
out = capture("status test.txt")
753
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"))
755
out = capture("status")
756
assert out == ("unknown:\n"
413
760
os.unlink('test2.txt')
415
762
progress("command aliases")
416
out = self.run_bzr("st")[0]
417
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
763
out = capture("st --all")
764
assert out == ("unknown:\n"
419
out = self.run_bzr("stat")[0]
420
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
767
out = capture("stat")
768
assert out == ("unknown:\n"
422
771
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')
774
runbzr("help commands")
775
runbzr("help slartibartfast", 1)
777
out = capture("help ci")
778
out.index('aliases: ')
780
progress("can't rename unversioned file")
781
runbzr("rename test.txt new-test.txt", 1)
783
progress("adding a file")
785
runbzr("add test.txt")
786
assert capture("unknowns") == ''
787
assert capture("status --all") == ("added:\n"
790
progress("rename newly-added file")
791
runbzr("rename test.txt hello.txt")
792
assert os.path.exists("hello.txt")
793
assert not os.path.exists("test.txt")
795
assert capture("revno") == '0\n'
797
progress("add first revision")
798
runbzr(['commit', '-m', 'add first revision'])
800
progress("more complex renames")
802
runbzr("rename hello.txt sub1", 1)
803
runbzr("rename hello.txt sub1/hello.txt", 1)
804
runbzr("move hello.txt sub1", 1)
807
runbzr("rename sub1 sub2")
808
runbzr("move hello.txt sub2")
809
self.assertEqual(capture("relpath sub2/hello.txt"),
810
os.path.join("sub2", "hello.txt\n"))
812
assert exists("sub2")
813
assert exists("sub2/hello.txt")
814
assert not exists("sub1")
815
assert not exists("hello.txt")
817
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
821
runbzr('move sub2/hello.txt sub1')
822
assert not exists('sub2/hello.txt')
823
assert exists('sub1/hello.txt')
824
runbzr('move sub2 sub1')
825
assert not exists('sub2')
826
assert exists('sub1/sub2')
828
runbzr(['commit', '-m', 'rename nested subdirectories'])
831
self.assertEquals(capture('root')[:-1],
832
os.path.join(self.test_dir, 'branch1'))
833
runbzr('move ../hello.txt .')
834
assert exists('./hello.txt')
835
self.assertEquals(capture('relpath hello.txt'),
836
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
837
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
838
runbzr(['commit', '-m', 'move to parent directory'])
840
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
842
runbzr('move sub2/hello.txt .')
843
assert exists('hello.txt')
431
845
f = file('hello.txt', 'wt')
432
846
f.write('some nice new content\n')
435
self.run_bzr("add hello.txt")
437
849
f = file('msg.tmp', 'wt')
438
850
f.write('this is my new commit\nand it has multiple lines, for fun')
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
853
runbzr('commit -F msg.tmp')
855
assert capture('revno') == '5\n'
856
runbzr('export -r 5 export-5.tmp')
857
runbzr('export export.tmp')
861
runbzr('log -v --forward')
862
runbzr('log -m', retcode=1)
863
log_out = capture('log -m commit')
864
assert "this is my new commit\n and" in log_out
865
assert "rename nested" not in log_out
866
assert 'revision-id' not in log_out
867
assert 'revision-id' in capture('log --show-ids -m commit')
869
log_out = capture('log --line')
460
870
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)
871
assert len(line) <= 79, len(line)
872
assert "this is my new commit and" in log_out
465
875
progress("file with spaces in name")
466
876
mkdir('sub directory')
467
877
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')
880
runbzr('commit -m add-spaces')
884
runbzr('log --forward')
478
888
if has_symlinks():
479
889
progress("symlinks")
480
890
mkdir('symlinks')
481
891
chdir('symlinks')
483
893
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'])
895
assert self.capture('unknowns') == ''
896
runbzr(['commit', '-m', '1: added symlink link1'])
489
self.run_bzr('add d1')
490
self.assertEquals(self.run_bzr('unknowns')[0], '')
900
assert self.capture('unknowns') == ''
491
901
os.symlink("NOWHERE2", "d1/link2")
492
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
902
assert self.capture('unknowns') == 'd1/link2\n'
493
903
# is d1/link2 found when adding d1
494
self.run_bzr('add d1')
495
self.assertEquals(self.run_bzr('unknowns')[0], '')
905
assert self.capture('unknowns') == ''
496
906
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'])
907
assert self.capture('unknowns') == 'd1/link3\n'
908
runbzr(['commit', '-m', '2: added dir, symlink'])
910
runbzr('rename d1 d2')
911
runbzr('move d2/link2 .')
912
runbzr('move link1 d2')
913
assert os.readlink("./link2") == "NOWHERE2"
914
assert os.readlink("d2/link1") == "NOWHERE1"
915
runbzr('add d2/link3')
917
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
510
919
os.unlink("link2")
511
920
os.symlink("TARGET 2", "link2")
512
921
os.unlink("d2/link1")
513
922
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'])
924
assert self.capture("relpath d2/link1") == "d2/link1\n"
925
runbzr(['commit', '-m', '4: retarget of two links'])
927
runbzr('remove d2/link1')
928
assert self.capture('unknowns') == 'd2/link1\n'
929
runbzr(['commit', '-m', '5: remove d2/link1'])
521
930
# 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'])
931
runbzr('add d2/link1')
932
runbzr(['commit', '-m', '6: add d2/link1'])
933
runbzr('rm d2/link1')
934
assert self.capture('unknowns') == 'd2/link1\n'
935
runbzr(['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')
939
runbzr('rename d2/link3 d1/link3new')
940
assert self.capture('unknowns') == 'd2/link1\n'
941
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
945
runbzr(['export', '-r', '1', 'exp1.tmp'])
538
946
chdir("exp1.tmp")
539
self.assertEquals(listdir_sorted("."), [ "link1" ])
540
self.assertEquals(os.readlink("link1"), "NOWHERE1")
947
assert listdir_sorted(".") == [ "link1" ]
948
assert os.readlink("link1") == "NOWHERE1"
543
self.run_bzr('export -r 2 exp2.tmp')
951
runbzr(['export', '-r', '2', 'exp2.tmp'])
544
952
chdir("exp2.tmp")
545
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
953
assert listdir_sorted(".") == [ "d1", "link1" ]
548
self.run_bzr('export -r 3 exp3.tmp')
956
runbzr(['export', '-r', '3', 'exp3.tmp'])
549
957
chdir("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")
958
assert listdir_sorted(".") == [ "d2", "link2" ]
959
assert listdir_sorted("d2") == [ "link1", "link3" ]
960
assert os.readlink("d2/link1") == "NOWHERE1"
961
assert os.readlink("link2") == "NOWHERE2"
556
self.run_bzr('export -r 4 exp4.tmp')
964
runbzr(['export', '-r', '4', 'exp4.tmp'])
557
965
chdir("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" ])
966
assert listdir_sorted(".") == [ "d2", "link2" ]
967
assert os.readlink("d2/link1") == "TARGET 1"
968
assert os.readlink("link2") == "TARGET 2"
969
assert listdir_sorted("d2") == [ "link1", "link3" ]
564
self.run_bzr('export -r 5 exp5.tmp')
972
runbzr(['export', '-r', '5', 'exp5.tmp'])
565
973
chdir("exp5.tmp")
566
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
567
self.assert_(os.path.islink("link2"))
568
self.assert_(listdir_sorted("d2")== [ "link3" ])
974
assert listdir_sorted(".") == [ "d2", "link2" ]
975
assert os.path.islink("link2")
976
assert listdir_sorted("d2")== [ "link3" ]
571
self.run_bzr('export -r 8 exp6.tmp')
979
runbzr(['export', '-r', '8', 'exp6.tmp'])
572
980
chdir("exp6.tmp")
573
981
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")
982
assert listdir_sorted("d1") == [ "link3new" ]
983
assert listdir_sorted("d2") == []
984
assert os.readlink("d1/link3new") == "NOWHERE3"
579
987
progress("skipping symlink tests")
582
class RemoteTests(object):
990
class HttpTests(TestCaseWithWebserver):
583
991
"""Test bzr ui commands against remote branches."""
585
993
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'])
995
branch = Branch.initialize('from')
996
branch.commit('empty commit for nonsense', allow_pointless=True)
997
url = self.get_remote_url('from')
998
self.run_bzr('branch', url, 'to')
592
999
branch = Branch.open('to')
593
1000
self.assertEqual(1, len(branch.revision_history()))
594
# the branch should be set in to to from
595
self.assertEqual(url + '/', branch.get_parent())
597
1002
def test_log(self):
598
1003
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')))
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')
619
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
1004
branch = Branch.initialize('branch')
1005
branch.add(['file'])
1006
branch.commit('add file', rev_id='A')
1007
url = self.get_remote_url('branch/file')
1008
output = self.capture('log %s' % url)
1009
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
