1
# Copyright (C) 2005-2010 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.tests.http_utils import TestCaseWithWebserver
48
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
49
from bzrlib.tests.blackbox import ExternalBase
50
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)
53
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
55
96
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)
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'
60
167
def test_revert(self):
63
170
file('hello', 'wt').write('foo')
64
self.run_bzr('add hello')
65
self.run_bzr('commit -m setup hello')
171
self.runbzr('add hello')
172
self.runbzr('commit -m setup hello')
67
174
file('goodbye', 'wt').write('baz')
68
self.run_bzr('add goodbye')
69
self.run_bzr('commit -m setup goodbye')
175
self.runbzr('add goodbye')
176
self.runbzr('commit -m setup goodbye')
71
178
file('hello', 'wt').write('bar')
72
179
file('goodbye', 'wt').write('qux')
73
self.run_bzr('revert hello')
180
self.runbzr('revert hello')
74
181
self.check_file_contents('hello', 'foo')
75
182
self.check_file_contents('goodbye', 'qux')
76
self.run_bzr('revert')
183
self.runbzr('revert')
77
184
self.check_file_contents('goodbye', 'baz')
79
186
os.mkdir('revertdir')
80
self.run_bzr('add revertdir')
81
self.run_bzr('commit -m f')
187
self.runbzr('add revertdir')
188
self.runbzr('commit -m f')
82
189
os.rmdir('revertdir')
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.failUnlessExists('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")
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'))
100
204
file('hello', 'wt').write('xyz')
101
self.run_bzr('commit -m xyz hello')
102
self.run_bzr('revert -r 1 hello')
205
self.runbzr('commit -m xyz hello')
206
self.runbzr('revert -r 1 hello')
103
207
self.check_file_contents('hello', 'foo')
104
self.run_bzr('revert hello')
208
self.runbzr('revert hello')
105
209
self.check_file_contents('hello', 'xyz')
106
210
os.chdir('revertdir')
107
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'])
227
def test_main_version(self):
228
"""Check output from version command and master option is reasonable"""
229
# output is intentionally passed through to stdout so that we
230
# can see the version being tested
231
output = self.runbzr('version', backtick=1)
232
self.log('bzr version output:')
234
self.assert_(output.startswith('bzr (bazaar-ng) '))
235
self.assertNotEqual(output.index('Canonical'), -1)
236
# make sure --version is consistent
237
tmp_output = self.runbzr('--version', backtick=1)
238
self.log('bzr --version output:')
240
self.assertEquals(output, tmp_output)
110
242
def example_branch(test):
112
244
file('hello', 'wt').write('foo')
113
test.run_bzr('add hello')
114
test.run_bzr('commit -m setup hello')
245
test.runbzr('add hello')
246
test.runbzr('commit -m setup hello')
115
247
file('goodbye', 'wt').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
open('b', 'wb').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.failIfEqual(out.find('Added Revisions:'), -1)
137
self.failIfEqual(out.find('message:\n added b'), -1)
138
self.failIfEqual(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.failIfEqual(remove_loc, -1)
149
added_loc = out.find('Added Revisions:')
150
self.failIfEqual(added_loc, -1)
152
removed_message = out.find('message:\n baz')
153
self.failIfEqual(removed_message, -1)
154
self.failUnless(remove_loc < removed_message < added_loc)
156
added_message = out.find('message:\n foo')
157
self.failIfEqual(added_message, -1)
158
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')
160
463
def test_locations(self):
161
464
"""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')
468
self.runbzr('commit -m unchanged --unchanged')
469
self.runbzr('pull', retcode=1)
470
self.runbzr('merge', retcode=1)
471
self.runbzr('branch . ../b')
171
self.run_bzr('branch . ../c')
172
self.run_bzr('pull ../c')
173
self.run_bzr('merge')
474
self.runbzr('branch . ../c')
475
self.runbzr('pull ../c')
175
self.run_bzr('pull ../b')
177
self.run_bzr('pull ../c')
178
self.run_bzr('branch ../c ../d')
179
osutils.rmtree('../c')
478
self.runbzr('pull ../b')
480
self.runbzr('pull ../c')
481
self.runbzr('branch ../c ../d')
482
shutil.rmtree('../c')
184
self.run_bzr('pull', retcode=3)
185
self.run_bzr('pull ../a --remember')
487
self.runbzr('pull', retcode=1)
488
self.runbzr('pull ../a --remember')
491
def test_add_reports(self):
492
"""add command prints the names of added files."""
493
b = Branch.initialize('.')
494
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
495
out = self.run_bzr_captured(['add'], retcode = 0)[0]
496
# the ordering is not defined at the moment
497
results = sorted(out.rstrip('\n').split('\n'))
498
self.assertEquals(['added dir',
499
'added dir'+os.sep+'sub.txt',
503
def test_add_quiet_is(self):
504
"""add -q does not print the names of added files."""
505
b = Branch.initialize('.')
506
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
507
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
508
# the ordering is not defined at the moment
509
results = sorted(out.rstrip('\n').split('\n'))
510
self.assertEquals([''], results)
188
512
def test_unknown_command(self):
189
513
"""Handling of unknown command."""
190
out, err = self.run_bzr('fluffy-badger', retcode=3)
514
out, err = self.run_bzr_captured(['fluffy-badger'],
191
516
self.assertEquals(out, '')
192
517
err.index('unknown command')
194
def create_conflicts(self):
195
"""Create a conflicted tree"""
519
def test_conflicts(self):
520
"""Handling of merge conflicts"""
198
523
file('hello', 'wb').write("hi world")
199
524
file('answer', 'wb').write("42")
202
self.run_bzr('commit -m base')
203
self.run_bzr('branch . ../other')
204
self.run_bzr('branch . ../this')
527
self.runbzr('commit -m base')
528
self.runbzr('branch . ../other')
529
self.runbzr('branch . ../this')
205
530
os.chdir('../other')
206
531
file('hello', 'wb').write("Hello.")
207
532
file('answer', 'wb').write("Is anyone there?")
208
self.run_bzr('commit -m other')
533
self.runbzr('commit -m other')
209
534
os.chdir('../this')
210
535
file('hello', 'wb').write("Hello, world")
211
self.run_bzr('mv answer question')
536
self.runbzr('mv answer question')
212
537
file('question', 'wb').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')
539
self.runbzr('commit -m this')
540
self.runbzr('merge ../other --show-base', retcode=1)
541
conflict_text = file('hello').read()
542
assert '<<<<<<<' in conflict_text
543
assert '>>>>>>>' in conflict_text
544
assert '=======' in conflict_text
545
assert '|||||||' in conflict_text
546
assert 'hi world' in conflict_text
547
self.runbzr('revert')
548
self.runbzr('resolve --all')
549
self.runbzr('merge ../other', retcode=1)
550
conflict_text = file('hello').read()
551
assert '|||||||' not in conflict_text
552
assert 'hi world' not in conflict_text
553
result = self.runbzr('conflicts', backtick=1)
554
self.assertEquals(result, "hello\nquestion\n")
555
result = self.runbzr('status', backtick=1)
556
assert "conflicts:\n hello\n question\n" in result, result
557
self.runbzr('resolve hello')
558
result = self.runbzr('conflicts', backtick=1)
559
self.assertEquals(result, "question\n")
560
self.runbzr('commit -m conflicts', retcode=1)
561
self.runbzr('resolve --all')
562
result = self.runbzr('conflicts', backtick=1)
563
self.runbzr('commit -m conflicts')
261
564
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
oldpath = os.environ.get('BZRPATH', None)
320
if 'BZRPATH' in os.environ:
321
del os.environ['BZRPATH']
323
f = file(cmd_name, 'wb')
324
if sys.platform == 'win32':
325
f.write('@echo off\n')
327
f.write('#!/bin/sh\n')
328
# f.write('echo Hello from test-command')
330
os.chmod(cmd_name, 0755)
332
# It should not find the command in the local
333
# directory by default, since it is not in my path
334
self.run_bzr(cmd_name, retcode=3)
336
# Now put it into my path
337
os.environ['BZRPATH'] = '.'
339
self.run_bzr(cmd_name)
341
# Make sure empty path elements are ignored
342
os.environ['BZRPATH'] = os.pathsep
344
self.run_bzr(cmd_name, retcode=3)
348
os.environ['BZRPATH'] = oldpath
566
def test_resign(self):
567
"""Test re signing of data."""
569
oldstrategy = bzrlib.gpg.GPGStrategy
570
branch = Branch.initialize('.')
571
branch.commit("base", allow_pointless=True, rev_id='A')
573
# monkey patch gpg signing mechanism
574
from bzrlib.testament import Testament
575
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
576
self.runbzr('re-sign -r revid:A')
577
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
578
branch.revision_store.get('A', 'sig').read())
580
bzrlib.gpg.GPGStrategy = oldstrategy
582
def test_resign_range(self):
584
oldstrategy = bzrlib.gpg.GPGStrategy
585
branch = Branch.initialize('.')
586
branch.commit("base", allow_pointless=True, rev_id='A')
587
branch.commit("base", allow_pointless=True, rev_id='B')
588
branch.commit("base", allow_pointless=True, rev_id='C')
590
# monkey patch gpg signing mechanism
591
from bzrlib.testament import Testament
592
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
593
self.runbzr('re-sign -r 1..')
594
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
595
branch.revision_store.get('A', 'sig').read())
596
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
597
branch.revision_store.get('B', 'sig').read())
598
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
599
branch.revision_store.get('C', 'sig').read())
601
bzrlib.gpg.GPGStrategy = oldstrategy
351
604
def listdir_sorted(dir):
377
632
f.write('hello world!\n')
380
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
382
out = self.run_bzr("status")[0]
383
self.assertEquals(out, 'unknown:\n test.txt\n')
635
self.assertEquals(capture('unknowns'), 'test.txt\n')
637
out = capture("status")
638
assert out == 'unknown:\n test.txt\n'
640
out = capture("status --all")
641
assert out == "unknown:\n test.txt\n"
643
out = capture("status test.txt --all")
644
assert out == "unknown:\n test.txt\n"
385
646
f = file('test2.txt', 'wt')
386
647
f.write('goodbye cruel world...\n')
389
out = self.run_bzr("status test.txt")[0]
390
self.assertEquals(out, "unknown:\n test.txt\n")
650
out = capture("status test.txt")
651
assert out == "unknown:\n test.txt\n"
392
out = self.run_bzr("status")[0]
393
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
653
out = capture("status")
654
assert out == ("unknown:\n"
395
658
os.unlink('test2.txt')
397
660
progress("command aliases")
398
out = self.run_bzr("st")[0]
399
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
661
out = capture("st --all")
662
assert out == ("unknown:\n"
401
out = self.run_bzr("stat")[0]
402
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
665
out = capture("stat")
666
assert out == ("unknown:\n"
404
669
progress("command help")
405
self.run_bzr("help st")
407
self.run_bzr("help commands")
408
self.run_bzr("help slartibartfast", retcode=3)
410
out = self.run_bzr("help ci")[0]
411
out.index('Aliases: ci, checkin\n')
672
runbzr("help commands")
673
runbzr("help slartibartfast", 1)
675
out = capture("help ci")
676
out.index('aliases: ')
678
progress("can't rename unversioned file")
679
runbzr("rename test.txt new-test.txt", 1)
681
progress("adding a file")
683
runbzr("add test.txt")
684
assert capture("unknowns") == ''
685
assert capture("status --all") == ("added:\n"
688
progress("rename newly-added file")
689
runbzr("rename test.txt hello.txt")
690
assert os.path.exists("hello.txt")
691
assert not os.path.exists("test.txt")
693
assert capture("revno") == '0\n'
695
progress("add first revision")
696
runbzr(['commit', '-m', 'add first revision'])
698
progress("more complex renames")
700
runbzr("rename hello.txt sub1", 1)
701
runbzr("rename hello.txt sub1/hello.txt", 1)
702
runbzr("move hello.txt sub1", 1)
705
runbzr("rename sub1 sub2")
706
runbzr("move hello.txt sub2")
707
self.assertEqual(capture("relpath sub2/hello.txt"),
708
os.path.join("sub2", "hello.txt\n"))
710
assert exists("sub2")
711
assert exists("sub2/hello.txt")
712
assert not exists("sub1")
713
assert not exists("hello.txt")
715
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
719
runbzr('move sub2/hello.txt sub1')
720
assert not exists('sub2/hello.txt')
721
assert exists('sub1/hello.txt')
722
runbzr('move sub2 sub1')
723
assert not exists('sub2')
724
assert exists('sub1/sub2')
726
runbzr(['commit', '-m', 'rename nested subdirectories'])
729
self.assertEquals(capture('root')[:-1],
730
os.path.join(self.test_dir, 'branch1'))
731
runbzr('move ../hello.txt .')
732
assert exists('./hello.txt')
733
self.assertEquals(capture('relpath hello.txt'),
734
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
735
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
736
runbzr(['commit', '-m', 'move to parent directory'])
738
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
740
runbzr('move sub2/hello.txt .')
741
assert exists('hello.txt')
413
743
f = file('hello.txt', 'wt')
414
744
f.write('some nice new content\n')
417
self.run_bzr("add hello.txt")
419
747
f = file('msg.tmp', 'wt')
420
748
f.write('this is my new commit\nand it has multiple lines, for fun')
423
self.run_bzr('commit -F msg.tmp')
425
self.assertEquals(self.run_bzr('revno')[0], '1\n')
426
self.run_bzr('export -r 1 export-1.tmp')
427
self.run_bzr('export export.tmp')
430
self.run_bzr('log -v')
431
self.run_bzr('log -v --forward')
432
self.run_bzr('log -m', retcode=3)
433
log_out = self.run_bzr('log -m commit')[0]
434
self.assert_("this is my new commit\n and" in log_out)
435
self.assert_("rename nested" not in log_out)
436
self.assert_('revision-id' not in log_out)
437
self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
439
log_out = self.run_bzr('log --line')[0]
440
# determine the widest line we want
441
max_width = osutils.terminal_width()
442
if max_width is not None:
443
for line in log_out.splitlines():
444
self.assert_(len(line) <= max_width - 1, len(line))
445
self.assert_("this is my new commit and" not in log_out)
446
self.assert_("this is my new commit" in log_out)
751
runbzr('commit -F msg.tmp')
753
assert capture('revno') == '5\n'
754
runbzr('export -r 5 export-5.tmp')
755
runbzr('export export.tmp')
759
runbzr('log -v --forward')
760
runbzr('log -m', retcode=1)
761
log_out = capture('log -m commit')
762
assert "this is my new commit\n and" in log_out
763
assert "rename nested" not in log_out
764
assert 'revision-id' not in log_out
765
assert 'revision-id' in capture('log --show-ids -m commit')
767
log_out = capture('log --line')
768
for line in log_out.splitlines():
769
assert len(line) <= 79, len(line)
770
assert "this is my new commit and" in log_out
448
773
progress("file with spaces in name")
449
774
mkdir('sub directory')
450
775
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
451
self.run_bzr('add .')
452
self.run_bzr('diff', retcode=1)
453
self.run_bzr('commit -m add-spaces')
454
self.run_bzr('check')
457
self.run_bzr('log --forward')
461
if osutils.has_symlinks():
778
runbzr('commit -m add-spaces')
782
runbzr('log --forward')
462
787
progress("symlinks")
463
788
mkdir('symlinks')
464
789
chdir('symlinks')
466
791
os.symlink("NOWHERE1", "link1")
467
self.run_bzr('add link1')
468
self.assertEquals(self.run_bzr('unknowns')[0], '')
469
self.run_bzr(['commit', '-m', '1: added symlink link1'])
793
assert self.capture('unknowns') == ''
794
runbzr(['commit', '-m', '1: added symlink link1'])
472
self.run_bzr('add d1')
473
self.assertEquals(self.run_bzr('unknowns')[0], '')
798
assert self.capture('unknowns') == ''
474
799
os.symlink("NOWHERE2", "d1/link2")
475
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
800
assert self.capture('unknowns') == 'd1/link2\n'
476
801
# is d1/link2 found when adding d1
477
self.run_bzr('add d1')
478
self.assertEquals(self.run_bzr('unknowns')[0], '')
803
assert self.capture('unknowns') == ''
479
804
os.symlink("NOWHERE3", "d1/link3")
480
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
481
self.run_bzr(['commit', '-m', '2: added dir, symlink'])
483
self.run_bzr('rename d1 d2')
484
self.run_bzr('move d2/link2 .')
485
self.run_bzr('move link1 d2')
486
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
487
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
488
self.run_bzr('add d2/link3')
489
self.run_bzr('diff', retcode=1)
490
self.run_bzr(['commit', '-m',
491
'3: rename of dir, move symlinks, add link3'])
805
assert self.capture('unknowns') == 'd1/link3\n'
806
runbzr(['commit', '-m', '2: added dir, symlink'])
808
runbzr('rename d1 d2')
809
runbzr('move d2/link2 .')
810
runbzr('move link1 d2')
811
assert os.readlink("./link2") == "NOWHERE2"
812
assert os.readlink("d2/link1") == "NOWHERE1"
813
runbzr('add d2/link3')
815
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
493
817
os.unlink("link2")
494
818
os.symlink("TARGET 2", "link2")
495
819
os.unlink("d2/link1")
496
820
os.symlink("TARGET 1", "d2/link1")
497
self.run_bzr('diff', retcode=1)
498
self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
499
self.run_bzr(['commit', '-m', '4: retarget of two links'])
501
self.run_bzr('remove --keep d2/link1')
502
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
503
self.run_bzr(['commit', '-m', '5: remove d2/link1'])
822
assert self.capture("relpath d2/link1") == "d2/link1\n"
823
runbzr(['commit', '-m', '4: retarget of two links'])
825
runbzr('remove d2/link1')
826
assert self.capture('unknowns') == 'd2/link1\n'
827
runbzr(['commit', '-m', '5: remove d2/link1'])
504
828
# try with the rm alias
505
self.run_bzr('add d2/link1')
506
self.run_bzr(['commit', '-m', '6: add d2/link1'])
507
self.run_bzr('rm --keep d2/link1')
508
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
509
self.run_bzr(['commit', '-m', '7: remove d2/link1'])
829
runbzr('add d2/link1')
830
runbzr(['commit', '-m', '6: add d2/link1'])
831
runbzr('rm d2/link1')
832
assert self.capture('unknowns') == 'd2/link1\n'
833
runbzr(['commit', '-m', '7: remove d2/link1'])
512
self.run_bzr('add d1')
513
self.run_bzr('rename d2/link3 d1/link3new')
514
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
515
self.run_bzr(['commit', '-m',
516
'8: remove d2/link1, move/rename link3'])
518
self.run_bzr('check')
520
self.run_bzr('export -r 1 exp1.tmp')
837
runbzr('rename d2/link3 d1/link3new')
838
assert self.capture('unknowns') == 'd2/link1\n'
839
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
843
runbzr(['export', '-r', '1', 'exp1.tmp'])
521
844
chdir("exp1.tmp")
522
self.assertEquals(listdir_sorted("."), [ "link1" ])
523
self.assertEquals(os.readlink("link1"), "NOWHERE1")
845
assert listdir_sorted(".") == [ "link1" ]
846
assert os.readlink("link1") == "NOWHERE1"
526
self.run_bzr('export -r 2 exp2.tmp')
849
runbzr(['export', '-r', '2', 'exp2.tmp'])
527
850
chdir("exp2.tmp")
528
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
851
assert listdir_sorted(".") == [ "d1", "link1" ]
531
self.run_bzr('export -r 3 exp3.tmp')
854
runbzr(['export', '-r', '3', 'exp3.tmp'])
532
855
chdir("exp3.tmp")
533
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
534
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
535
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
536
self.assertEquals(os.readlink("link2") , "NOWHERE2")
856
assert listdir_sorted(".") == [ "d2", "link2" ]
857
assert listdir_sorted("d2") == [ "link1", "link3" ]
858
assert os.readlink("d2/link1") == "NOWHERE1"
859
assert os.readlink("link2") == "NOWHERE2"
539
self.run_bzr('export -r 4 exp4.tmp')
862
runbzr(['export', '-r', '4', 'exp4.tmp'])
540
863
chdir("exp4.tmp")
541
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
542
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
543
self.assertEquals(os.readlink("link2") , "TARGET 2")
544
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
864
assert listdir_sorted(".") == [ "d2", "link2" ]
865
assert os.readlink("d2/link1") == "TARGET 1"
866
assert os.readlink("link2") == "TARGET 2"
867
assert listdir_sorted("d2") == [ "link1", "link3" ]
547
self.run_bzr('export -r 5 exp5.tmp')
870
runbzr(['export', '-r', '5', 'exp5.tmp'])
548
871
chdir("exp5.tmp")
549
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
550
self.assert_(os.path.islink("link2"))
551
self.assert_(listdir_sorted("d2")== [ "link3" ])
872
assert listdir_sorted(".") == [ "d2", "link2" ]
873
assert os.path.islink("link2")
874
assert listdir_sorted("d2")== [ "link3" ]
554
self.run_bzr('export -r 8 exp6.tmp')
877
runbzr(['export', '-r', '8', 'exp6.tmp'])
555
878
chdir("exp6.tmp")
556
879
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
557
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
558
self.assertEquals(listdir_sorted("d2"), [])
559
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
880
assert listdir_sorted("d1") == [ "link3new" ]
881
assert listdir_sorted("d2") == []
882
assert os.readlink("d1/link3new") == "NOWHERE3"
562
885
progress("skipping symlink tests")
565
class RemoteTests(object):
888
class HttpTests(TestCaseWithWebserver):
566
889
"""Test bzr ui commands against remote branches."""
568
891
def test_branch(self):
570
wt = self.make_branch_and_tree('from')
572
wt.commit('empty commit for nonsense', allow_pointless=True)
573
url = self.get_readonly_url('from')
574
self.run_bzr(['branch', url, 'to'])
893
branch = Branch.initialize('from')
894
branch.commit('empty commit for nonsense', allow_pointless=True)
895
url = self.get_remote_url('from')
896
self.run_bzr('branch', url, 'to')
575
897
branch = Branch.open('to')
576
898
self.assertEqual(1, len(branch.revision_history()))
577
# the branch should be set in to to from
578
self.assertEqual(url + '/', branch.get_parent())
580
900
def test_log(self):
581
901
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/file')
586
output = self.run_bzr('log %s' % url)[0]
587
self.assertEqual(8, len(output.split('\n')))
589
def test_check(self):
590
self.build_tree(['branch/', 'branch/file'])
591
self.run_bzr('init branch')[0]
592
self.run_bzr('add branch/file')[0]
593
self.run_bzr('commit -m foo branch')[0]
594
url = self.get_readonly_url('branch/')
595
self.run_bzr(['check', url])
598
# create a source branch
599
os.mkdir('my-branch')
600
os.chdir('my-branch')
602
file('hello', 'wt').write('foo')
603
self.run_bzr('add hello')
604
self.run_bzr('commit -m setup')
606
# with an explicit target work
607
self.run_bzr(['push', self.get_url('output-branch')])
610
class HTTPTests(TestCaseWithWebserver, RemoteTests):
611
"""Test various commands against a HTTP server."""
614
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
615
"""Test various commands against a SFTP server using abs paths."""
618
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
619
"""Test various commands against a SFTP server using abs paths."""
622
super(SFTPTestsAbsoluteSibling, self).setUp()
623
self._override_home = '/dev/noone/runs/tests/here'
626
class SFTPTestsRelative(TestCaseWithSFTPServer, RemoteTests):
627
"""Test various commands against a SFTP server using homedir rel paths."""
630
super(SFTPTestsRelative, self).setUp()
631
self._get_remote_is_absolute = False
902
branch = Branch.initialize('branch')
904
branch.commit('add file', rev_id='A')
905
url = self.get_remote_url('branch/file')
906
output = self.capture('log %s' % url)
907
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
