To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 1474
- compare with another revision
- download diff
- download tarball
- view history from revision 1474
- Committer: Robert Collins
- Date: 2005-10-20 04:08:12 UTC
- mfrom: (1185.12.68)
- Revision ID: robertc@robertcollins.net-20051020040812-fecd1bc32aa3478e
Merge from Aaron Bentley.
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files removed:
- bzrlib/meta_store.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/selftest/blackbox.py
19
19
"""Black-box tests for bzr.
20
20
21
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface.
23
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.
22
command-line interface. This doesn't actually run a new interpreter but
23
rather starts again from the run_bzr function.
27
24
"""
28
25
26
27
from cStringIO import StringIO
28
import os
29
import re
30
import shutil
29
31
import sys
30
32
31
from bzrlib.selftest import TestBase, InTempDir, BzrTestBase
32
33
34
35
class ExternalBase(InTempDir):
36
def runbzr(self, args, retcode=0):
37
try:
38
import shutil
39
from subprocess import call
40
except ImportError, e:
41
_need_subprocess()
42
raise
43
33
from bzrlib.branch import Branch
34
from bzrlib.clone import copy_branch
35
from bzrlib.errors import BzrCommandError
36
from bzrlib.osutils import has_symlinks
37
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
38
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
39
40
41
class ExternalBase(TestCaseInTempDir):
42
43
def runbzr(self, args, retcode=0, backtick=False):
44
44
if isinstance(args, basestring):
45
45
args = args.split()
46
47
return self.runcmd(['python', self.BZRPATH,] + args,
48
retcode=retcode)
49
50
51
52
class MvCommand(BzrTestBase):
53
def runbzr(self):
54
"""Test two modes of operation for mv"""
55
b = Branch('.', init=True)
56
self.build_tree(['a', 'c', 'subdir/'])
57
self.run_bzr('mv', 'a', 'b')
58
self.run_bzr('mv', 'b', 'subdir')
59
self.run_bzr('mv', 'subdir/b', 'a')
60
self.run_bzr('mv', 'a', 'b', 'subdir')
61
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
62
63
64
65
class TestVersion(BzrTestBase):
66
"""Check output from version command and master option is reasonable"""
67
def runTest(self):
68
# output is intentionally passed through to stdout so that we
69
# can see the version being tested
70
from cStringIO import StringIO
71
save_out = sys.stdout
72
try:
73
sys.stdout = tmp_out = StringIO()
74
75
self.run_bzr('version')
76
finally:
77
sys.stdout = save_out
78
79
output = tmp_out.getvalue()
80
self.log('bzr version output:')
81
self.log(output)
82
83
self.assert_(output.startswith('bzr (bazaar-ng) '))
84
self.assertNotEqual(output.index('Canonical'), -1)
85
86
# make sure --version is consistent
87
try:
88
sys.stdout = tmp_out = StringIO()
89
90
self.run_bzr('--version')
91
finally:
92
sys.stdout = save_out
93
94
self.log('bzr --version output:')
95
self.log(tmp_out.getvalue())
96
97
self.assertEquals(output, tmp_out.getvalue())
98
99
100
101
102
103
class HelpCommands(ExternalBase):
104
def runTest(self):
46
47
if backtick:
48
return self.run_bzr_captured(args, retcode=retcode)[0]
49
else:
50
return self.run_bzr_captured(args, retcode=retcode)
51
52
53
class TestCommands(ExternalBase):
54
55
def test_help_commands(self):
105
56
self.runbzr('--help')
106
57
self.runbzr('help')
107
58
self.runbzr('help commands')
108
59
self.runbzr('help help')
109
60
self.runbzr('commit -h')
110
61
111
112
class InitBranch(ExternalBase):
113
def runTest(self):
114
import os
62
def test_init_branch(self):
115
63
self.runbzr(['init'])
116
64
117
118
119
class UserIdentity(ExternalBase):
120
def runTest(self):
65
def test_whoami(self):
121
66
# this should always identify something, if only "john@localhost"
122
67
self.runbzr("whoami")
123
68
self.runbzr("whoami --email")
124
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
125
1)
126
127
128
class InvalidCommands(ExternalBase):
129
def runTest(self):
69
70
self.assertEquals(self.runbzr("whoami --email",
71
backtick=True).count('@'), 1)
72
73
def test_whoami_branch(self):
74
"""branch specific user identity works."""
75
self.runbzr('init')
76
f = file('.bzr/email', 'wt')
77
f.write('Branch Identity <branch@identi.ty>')
78
f.close()
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
87
# in the file
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
95
96
def test_invalid_commands(self):
130
97
self.runbzr("pants", retcode=1)
131
98
self.runbzr("--pants off", retcode=1)
132
99
self.runbzr("diff --message foo", retcode=1)
133
100
134
135
136
class EmptyCommit(ExternalBase):
137
def runTest(self):
101
def test_empty_commit(self):
138
102
self.runbzr("init")
139
103
self.build_tree(['hello.txt'])
140
104
self.runbzr("commit -m empty", retcode=1)
141
105
self.runbzr("add hello.txt")
142
106
self.runbzr("commit -m added")
143
107
144
145
146
class IgnorePatterns(ExternalBase):
147
def runTest(self):
108
def test_empty_commit_message(self):
109
self.runbzr("init")
110
file('foo.c', 'wt').write('int main() {}')
111
self.runbzr(['add', 'foo.c'])
112
self.runbzr(["commit", "-m", ""] , retcode=1)
113
114
def test_ignore_patterns(self):
148
115
from bzrlib.branch import Branch
149
116
150
b = Branch('.', init=True)
117
b = Branch.initialize('.')
151
118
self.assertEquals(list(b.unknowns()), [])
152
119
153
120
file('foo.tmp', 'wt').write('tmp files are ignored')
154
121
self.assertEquals(list(b.unknowns()), [])
155
assert self.backtick('bzr unknowns') == ''
122
assert self.capture('unknowns') == ''
156
123
157
124
file('foo.c', 'wt').write('int main() {}')
158
125
self.assertEquals(list(b.unknowns()), ['foo.c'])
159
assert self.backtick('bzr unknowns') == 'foo.c\n'
126
assert self.capture('unknowns') == 'foo.c\n'
160
127
161
128
self.runbzr(['add', 'foo.c'])
162
assert self.backtick('bzr unknowns') == ''
129
assert self.capture('unknowns') == ''
163
130
164
131
# 'ignore' works when creating the .bzignore file
165
132
file('foo.blah', 'wt').write('blah')
166
133
self.assertEquals(list(b.unknowns()), ['foo.blah'])
167
134
self.runbzr('ignore *.blah')
168
135
self.assertEquals(list(b.unknowns()), [])
169
assert file('.bzrignore', 'rb').read() == '*.blah\n'
136
assert file('.bzrignore', 'rU').read() == '*.blah\n'
170
137
171
138
# 'ignore' works when then .bzrignore file already exists
172
139
file('garh', 'wt').write('garh')
173
140
self.assertEquals(list(b.unknowns()), ['garh'])
174
assert self.backtick('bzr unknowns') == 'garh\n'
141
assert self.capture('unknowns') == 'garh\n'
175
142
self.runbzr('ignore garh')
176
143
self.assertEquals(list(b.unknowns()), [])
177
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
178
179
144
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
145
146
def test_revert(self):
147
self.runbzr('init')
148
149
file('hello', 'wt').write('foo')
150
self.runbzr('add hello')
151
self.runbzr('commit -m setup hello')
152
153
file('goodbye', 'wt').write('baz')
154
self.runbzr('add goodbye')
155
self.runbzr('commit -m setup goodbye')
156
157
file('hello', 'wt').write('bar')
158
file('goodbye', 'wt').write('qux')
159
self.runbzr('revert hello')
160
self.check_file_contents('hello', 'foo')
161
self.check_file_contents('goodbye', 'qux')
162
self.runbzr('revert')
163
self.check_file_contents('goodbye', 'baz')
164
165
os.mkdir('revertdir')
166
self.runbzr('add revertdir')
167
self.runbzr('commit -m f')
168
os.rmdir('revertdir')
169
self.runbzr('revert')
170
171
os.symlink('/unlikely/to/exist', 'symlink')
172
self.runbzr('add symlink')
173
self.runbzr('commit -m f')
174
os.unlink('symlink')
175
self.runbzr('revert')
176
self.failUnlessExists('symlink')
177
os.unlink('symlink')
178
os.symlink('a-different-path', 'symlink')
179
self.runbzr('revert')
180
self.assertEqual('/unlikely/to/exist',
181
os.readlink('symlink'))
182
183
file('hello', 'wt').write('xyz')
184
self.runbzr('commit -m xyz hello')
185
self.runbzr('revert -r 1 hello')
186
self.check_file_contents('hello', 'foo')
187
self.runbzr('revert hello')
188
self.check_file_contents('hello', 'xyz')
189
os.chdir('revertdir')
190
self.runbzr('revert')
191
os.chdir('..')
192
193
194
def test_mv_modes(self):
195
"""Test two modes of operation for mv"""
196
from bzrlib.branch import Branch
197
b = Branch.initialize('.')
198
self.build_tree(['a', 'c', 'subdir/'])
199
self.run_bzr_captured(['add', self.test_dir])
200
self.run_bzr_captured(['mv', 'a', 'b'])
201
self.run_bzr_captured(['mv', 'b', 'subdir'])
202
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
203
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
204
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
205
206
def test_main_version(self):
207
"""Check output from version command and master option is reasonable"""
208
# output is intentionally passed through to stdout so that we
209
# can see the version being tested
210
output = self.runbzr('version', backtick=1)
211
self.log('bzr version output:')
212
self.log(output)
213
self.assert_(output.startswith('bzr (bazaar-ng) '))
214
self.assertNotEqual(output.index('Canonical'), -1)
215
# make sure --version is consistent
216
tmp_output = self.runbzr('--version', backtick=1)
217
self.log('bzr --version output:')
218
self.log(tmp_output)
219
self.assertEquals(output, tmp_output)
220
221
def example_branch(test):
222
test.runbzr('init')
223
file('hello', 'wt').write('foo')
224
test.runbzr('add hello')
225
test.runbzr('commit -m setup hello')
226
file('goodbye', 'wt').write('baz')
227
test.runbzr('add goodbye')
228
test.runbzr('commit -m setup goodbye')
229
230
def test_export(self):
231
os.mkdir('branch')
232
os.chdir('branch')
233
self.example_branch()
234
self.runbzr('export ../latest')
235
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
236
self.runbzr('export ../first -r 1')
237
assert not os.path.exists('../first/goodbye')
238
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
239
self.runbzr('export ../first.gz -r 1')
240
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
241
self.runbzr('export ../first.bz2 -r 1')
242
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
243
self.runbzr('export ../first.tar -r 1')
244
assert os.path.isfile('../first.tar')
245
from tarfile import TarFile
246
tf = TarFile('../first.tar')
247
assert 'first/hello' in tf.getnames(), tf.getnames()
248
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
249
self.runbzr('export ../first.tar.gz -r 1')
250
assert os.path.isfile('../first.tar.gz')
251
self.runbzr('export ../first.tbz2 -r 1')
252
assert os.path.isfile('../first.tbz2')
253
self.runbzr('export ../first.tar.bz2 -r 1')
254
assert os.path.isfile('../first.tar.bz2')
255
self.runbzr('export ../first.tar.tbz2 -r 1')
256
assert os.path.isfile('../first.tar.tbz2')
257
from bz2 import BZ2File
258
tf = TarFile('../first.tar.tbz2',
259
fileobj=BZ2File('../first.tar.tbz2', 'r'))
260
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
261
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
262
self.runbzr('export ../first2.tar -r 1 --root pizza')
263
tf = TarFile('../first2.tar')
264
assert 'pizza/hello' in tf.getnames(), tf.getnames()
265
266
def test_diff(self):
267
self.example_branch()
268
file('hello', 'wt').write('hello world!')
269
self.runbzr('commit -m fixing hello')
270
output = self.runbzr('diff -r 2..3', backtick=1)
271
self.assert_('\n+hello world!' in output)
272
output = self.runbzr('diff -r last:3..last:1', backtick=1)
273
self.assert_('\n+baz' in output)
274
275
def test_diff_branches(self):
276
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
277
branch = Branch.initialize('branch1')
278
branch.add(['file'])
279
branch.commit('add file')
280
copy_branch(branch, 'branch2')
281
print >> open('branch2/file', 'w'), 'new content'
282
branch2 = Branch.open('branch2')
283
branch2.commit('update file')
284
# should open branch1 and diff against branch2,
285
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
286
self.assertEquals(("=== modified file 'file'\n"
287
"--- file\n"
288
"+++ file\n"
289
"@@ -1,1 +1,1 @@\n"
290
"-new content\n"
291
"+contents of branch1/file\n"
292
"\n", ''), output)
293
294
def test_branch(self):
295
"""Branch from one branch to another."""
296
os.mkdir('a')
297
os.chdir('a')
298
self.example_branch()
299
os.chdir('..')
300
self.runbzr('branch a b')
301
self.runbzr('branch a c -r 1')
302
os.chdir('b')
303
self.runbzr('commit -m foo --unchanged')
304
os.chdir('..')
305
# naughty - abstraction violations RBC 20050928
306
print "test_branch used to delete the stores, how is this meant to work ?"
307
#shutil.rmtree('a/.bzr/revision-store')
308
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
309
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
310
self.runbzr('branch a d --basis b')
311
312
def test_merge(self):
313
from bzrlib.branch import Branch
314
315
os.mkdir('a')
316
os.chdir('a')
317
self.example_branch()
318
os.chdir('..')
319
self.runbzr('branch a b')
320
os.chdir('b')
321
file('goodbye', 'wt').write('quux')
322
self.runbzr(['commit', '-m', "more u's are always good"])
323
324
os.chdir('../a')
325
file('hello', 'wt').write('quuux')
326
# We can't merge when there are in-tree changes
327
self.runbzr('merge ../b', retcode=1)
328
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
329
self.runbzr('merge ../b -r last:1..last:1')
330
self.runbzr('revert --no-backup')
331
self.runbzr('merge ../b -r last:1')
332
self.check_file_contents('goodbye', 'quux')
333
# Merging a branch pulls its revision into the tree
334
a = Branch.open('.')
335
b = Branch.open('../b')
336
a.get_revision_xml(b.last_revision())
337
self.log('pending merges: %s', a.pending_merges())
338
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
339
# % (a.pending_merges(), b.last_patch())
340
341
def test_merge_with_missing_file(self):
342
"""Merge handles missing file conflicts"""
343
os.mkdir('a')
344
os.chdir('a')
345
os.mkdir('sub')
346
print >> file('sub/a.txt', 'wb'), "hello"
347
print >> file('b.txt', 'wb'), "hello"
348
print >> file('sub/c.txt', 'wb'), "hello"
349
self.runbzr('init')
350
self.runbzr('add')
351
self.runbzr(('commit', '-m', 'added a'))
352
self.runbzr('branch . ../b')
353
print >> file('sub/a.txt', 'ab'), "there"
354
print >> file('b.txt', 'ab'), "there"
355
print >> file('sub/c.txt', 'ab'), "there"
356
self.runbzr(('commit', '-m', 'Added there'))
357
os.unlink('sub/a.txt')
358
os.unlink('sub/c.txt')
359
os.rmdir('sub')
360
os.unlink('b.txt')
361
self.runbzr(('commit', '-m', 'Removed a.txt'))
362
os.chdir('../b')
363
print >> file('sub/a.txt', 'ab'), "something"
364
print >> file('b.txt', 'ab'), "something"
365
print >> file('sub/c.txt', 'ab'), "something"
366
self.runbzr(('commit', '-m', 'Modified a.txt'))
367
self.runbzr('merge ../a/')
368
assert os.path.exists('sub/a.txt.THIS')
369
assert os.path.exists('sub/a.txt.BASE')
370
os.chdir('../a')
371
self.runbzr('merge ../b/')
372
assert os.path.exists('sub/a.txt.OTHER')
373
assert os.path.exists('sub/a.txt.BASE')
374
375
def test_pull(self):
376
"""Pull changes from one branch to another."""
377
os.mkdir('a')
378
os.chdir('a')
379
380
self.example_branch()
381
self.runbzr('pull', retcode=1)
382
self.runbzr('missing', retcode=1)
383
self.runbzr('missing .')
384
self.runbzr('missing')
385
self.runbzr('pull')
386
self.runbzr('pull /', retcode=1)
387
self.runbzr('pull')
388
389
os.chdir('..')
390
self.runbzr('branch a b')
391
os.chdir('b')
392
self.runbzr('pull')
393
os.mkdir('subdir')
394
self.runbzr('add subdir')
395
self.runbzr('commit -m blah --unchanged')
396
os.chdir('../a')
397
a = Branch.open('.')
398
b = Branch.open('../b')
399
assert a.revision_history() == b.revision_history()[:-1]
400
self.runbzr('pull ../b')
401
assert a.revision_history() == b.revision_history()
402
self.runbzr('commit -m blah2 --unchanged')
403
os.chdir('../b')
404
self.runbzr('commit -m blah3 --unchanged')
405
# no clobber
406
self.runbzr('pull ../a', retcode=1)
407
os.chdir('..')
408
self.runbzr('branch b clobberme')
409
os.chdir('clobberme')
410
self.runbzr('pull --clobber ../a')
411
clobbered = Branch.open('.')
412
self.assertEqual(clobbered.revision_history(),
413
a.revision_history())
414
os.chdir('../a')
415
self.runbzr('merge ../b')
416
self.runbzr('commit -m blah4 --unchanged')
417
os.chdir('../b/subdir')
418
self.runbzr('pull ../../a')
419
assert a.revision_history()[-1] == b.revision_history()[-1]
420
self.runbzr('commit -m blah5 --unchanged')
421
self.runbzr('commit -m blah6 --unchanged')
422
os.chdir('..')
423
self.runbzr('pull ../a')
424
os.chdir('../a')
425
self.runbzr('commit -m blah7 --unchanged')
426
self.runbzr('merge ../b')
427
self.runbzr('commit -m blah8 --unchanged')
428
self.runbzr('pull ../b')
429
self.runbzr('pull ../b')
430
431
def test_locations(self):
432
"""Using and remembering different locations"""
433
os.mkdir('a')
434
os.chdir('a')
435
self.runbzr('init')
436
self.runbzr('commit -m unchanged --unchanged')
437
self.runbzr('pull', retcode=1)
438
self.runbzr('merge', retcode=1)
439
self.runbzr('branch . ../b')
440
os.chdir('../b')
441
self.runbzr('pull')
442
self.runbzr('branch . ../c')
443
self.runbzr('pull ../c')
444
self.runbzr('merge')
445
os.chdir('../a')
446
self.runbzr('pull ../b')
447
self.runbzr('pull')
448
self.runbzr('pull ../c')
449
self.runbzr('branch ../c ../d')
450
shutil.rmtree('../c')
451
self.runbzr('pull')
452
os.chdir('../b')
453
self.runbzr('pull')
454
os.chdir('../d')
455
self.runbzr('pull', retcode=1)
456
self.runbzr('pull ../a --remember')
457
self.runbzr('pull')
458
459
def test_add_reports(self):
460
"""add command prints the names of added files."""
461
b = Branch.initialize('.')
462
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
463
out = self.run_bzr_captured(['add'], retcode = 0)[0]
464
# the ordering is not defined at the moment
465
results = sorted(out.rstrip('\n').split('\n'))
466
self.assertEquals(['added dir',
467
'added dir'+os.sep+'sub.txt',
468
'added top.txt',],
469
results)
470
471
def test_add_quiet_is(self):
472
"""add -q does not print the names of added files."""
473
b = Branch.initialize('.')
474
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
475
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
476
# the ordering is not defined at the moment
477
results = sorted(out.rstrip('\n').split('\n'))
478
self.assertEquals([''], results)
479
480
def test_unknown_command(self):
481
"""Handling of unknown command."""
482
out, err = self.run_bzr_captured(['fluffy-badger'],
483
retcode=1)
484
self.assertEquals(out, '')
485
err.index('unknown command')
486
487
def test_conflicts(self):
488
"""Handling of merge conflicts"""
489
os.mkdir('base')
490
os.chdir('base')
491
file('hello', 'wb').write("hi world")
492
file('answer', 'wb').write("42")
493
self.runbzr('init')
494
self.runbzr('add')
495
self.runbzr('commit -m base')
496
self.runbzr('branch . ../other')
497
self.runbzr('branch . ../this')
498
os.chdir('../other')
499
file('hello', 'wb').write("Hello.")
500
file('answer', 'wb').write("Is anyone there?")
501
self.runbzr('commit -m other')
502
os.chdir('../this')
503
file('hello', 'wb').write("Hello, world")
504
self.runbzr('mv answer question')
505
file('question', 'wb').write("What do you get when you multiply six"
506
"times nine?")
507
self.runbzr('commit -m this')
508
self.runbzr('merge ../other --show-base')
509
conflict_text = file('hello').read()
510
assert '<<<<<<<' in conflict_text
511
assert '>>>>>>>' in conflict_text
512
assert '=======' in conflict_text
513
assert '|||||||' in conflict_text
514
assert 'hi world' in conflict_text
515
self.runbzr('revert')
516
self.runbzr('resolve --all')
517
self.runbzr('merge ../other')
518
conflict_text = file('hello').read()
519
assert '|||||||' not in conflict_text
520
assert 'hi world' not in conflict_text
521
result = self.runbzr('conflicts', backtick=1)
522
self.assertEquals(result, "hello\nquestion\n")
523
result = self.runbzr('status', backtick=1)
524
assert "conflicts:\n hello\n question\n" in result, result
525
self.runbzr('resolve hello')
526
result = self.runbzr('conflicts', backtick=1)
527
self.assertEquals(result, "question\n")
528
self.runbzr('commit -m conflicts', retcode=1)
529
self.runbzr('resolve --all')
530
result = self.runbzr('conflicts', backtick=1)
531
self.runbzr('commit -m conflicts')
532
self.assertEquals(result, "")
533
534
def test_resign(self):
535
"""Test re signing of data."""
536
import bzrlib.gpg
537
oldstrategy = bzrlib.gpg.GPGStrategy
538
branch = Branch.initialize('.')
539
branch.commit("base", allow_pointless=True, rev_id='A')
540
try:
541
# monkey patch gpg signing mechanism
542
from bzrlib.testament import Testament
543
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
544
self.runbzr('re-sign -r revid:A')
545
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
546
branch.revision_store.get('A', 'sig').read())
547
finally:
548
bzrlib.gpg.GPGStrategy = oldstrategy
549
550
def listdir_sorted(dir):
551
L = os.listdir(dir)
552
L.sort()
553
return L
180
554
181
555
182
556
class OldTests(ExternalBase):
183
# old tests moved from ./testbzr
184
def runTest(self):
557
"""old tests moved from ./testbzr."""
558
559
def test_bzr(self):
185
560
from os import chdir, mkdir
186
561
from os.path import exists
187
import os
188
562
189
563
runbzr = self.runbzr
190
backtick = self.backtick
564
capture = self.capture
191
565
progress = self.log
192
566
193
567
progress("basic branch creation")
195
569
chdir('branch1')
196
570
runbzr('init')
197
571
198
self.assertEquals(backtick('bzr root').rstrip(),
572
self.assertEquals(capture('root').rstrip(),
199
573
os.path.join(self.test_dir, 'branch1'))
200
574
201
575
progress("status of new file")
204
578
f.write('hello world!\n')
205
579
f.close()
206
580
207
out = backtick("bzr unknowns")
208
self.assertEquals(out, 'test.txt\n')
581
self.assertEquals(capture('unknowns'), 'test.txt\n')
209
582
210
out = backtick("bzr status")
583
out = capture("status")
211
584
assert out == 'unknown:\n test.txt\n'
212
585
213
out = backtick("bzr status --all")
586
out = capture("status --all")
214
587
assert out == "unknown:\n test.txt\n"
215
588
216
out = backtick("bzr status test.txt --all")
589
out = capture("status test.txt --all")
217
590
assert out == "unknown:\n test.txt\n"
218
591
219
592
f = file('test2.txt', 'wt')
220
593
f.write('goodbye cruel world...\n')
221
594
f.close()
222
595
223
out = backtick("bzr status test.txt")
596
out = capture("status test.txt")
224
597
assert out == "unknown:\n test.txt\n"
225
598
226
out = backtick("bzr status")
599
out = capture("status")
227
600
assert out == ("unknown:\n"
228
601
" test.txt\n"
229
602
" test2.txt\n")
231
604
os.unlink('test2.txt')
232
605
233
606
progress("command aliases")
234
out = backtick("bzr st --all")
607
out = capture("st --all")
235
608
assert out == ("unknown:\n"
236
609
" test.txt\n")
237
610
238
out = backtick("bzr stat")
611
out = capture("stat")
239
612
assert out == ("unknown:\n"
240
613
" test.txt\n")
241
614
245
618
runbzr("help commands")
246
619
runbzr("help slartibartfast", 1)
247
620
248
out = backtick("bzr help ci")
621
out = capture("help ci")
249
622
out.index('aliases: ')
250
623
251
624
progress("can't rename unversioned file")
254
627
progress("adding a file")
255
628
256
629
runbzr("add test.txt")
257
assert backtick("bzr unknowns") == ''
258
assert backtick("bzr status --all") == ("added:\n"
630
assert capture("unknowns") == ''
631
assert capture("status --all") == ("added:\n"
259
632
" test.txt\n")
260
633
261
634
progress("rename newly-added file")
263
636
assert os.path.exists("hello.txt")
264
637
assert not os.path.exists("test.txt")
265
638
266
assert backtick("bzr revno") == '0\n'
639
assert capture("revno") == '0\n'
267
640
268
641
progress("add first revision")
269
642
runbzr(['commit', '-m', 'add first revision'])
277
650
runbzr("add sub1")
278
651
runbzr("rename sub1 sub2")
279
652
runbzr("move hello.txt sub2")
280
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
653
self.assertEqual(capture("relpath sub2/hello.txt"),
654
os.path.join("sub2", "hello.txt\n"))
281
655
282
656
assert exists("sub2")
283
657
assert exists("sub2/hello.txt")
298
672
runbzr(['commit', '-m', 'rename nested subdirectories'])
299
673
300
674
chdir('sub1/sub2')
301
self.assertEquals(backtick('bzr root')[:-1],
675
self.assertEquals(capture('root')[:-1],
302
676
os.path.join(self.test_dir, 'branch1'))
303
677
runbzr('move ../hello.txt .')
304
678
assert exists('./hello.txt')
305
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
306
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
679
self.assertEquals(capture('relpath hello.txt'),
680
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
681
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
307
682
runbzr(['commit', '-m', 'move to parent directory'])
308
683
chdir('..')
309
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
684
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
310
685
311
686
runbzr('move sub2/hello.txt .')
312
687
assert exists('hello.txt')
316
691
f.close()
317
692
318
693
f = file('msg.tmp', 'wt')
319
f.write('this is my new commit\n')
694
f.write('this is my new commit\nand it has multiple lines, for fun')
320
695
f.close()
321
696
322
697
runbzr('commit -F msg.tmp')
323
698
324
assert backtick('bzr revno') == '5\n'
699
assert capture('revno') == '5\n'
325
700
runbzr('export -r 5 export-5.tmp')
326
701
runbzr('export export.tmp')
327
702
329
704
runbzr('log -v')
330
705
runbzr('log -v --forward')
331
706
runbzr('log -m', retcode=1)
332
log_out = backtick('bzr log -m commit')
333
assert "this is my new commit" in log_out
707
log_out = capture('log -m commit')
708
assert "this is my new commit\n and" in log_out
334
709
assert "rename nested" not in log_out
335
710
assert 'revision-id' not in log_out
336
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
711
assert 'revision-id' in capture('log --show-ids -m commit')
712
713
log_out = capture('log --line')
714
for line in log_out.splitlines():
715
assert len(line) <= 79, len(line)
716
assert "this is my new commit and" in log_out
337
717
338
718
339
719
progress("file with spaces in name")
349
729
350
730
runbzr('info')
351
731
352
353
354
355
356
357
class RevertCommand(ExternalBase):
358
def runTest(self):
359
self.runbzr('init')
360
361
file('hello', 'wt').write('foo')
362
self.runbzr('add hello')
363
self.runbzr('commit -m setup hello')
732
if has_symlinks():
733
progress("symlinks")
734
mkdir('symlinks')
735
chdir('symlinks')
736
runbzr('init')
737
os.symlink("NOWHERE1", "link1")
738
runbzr('add link1')
739
assert self.capture('unknowns') == ''
740
runbzr(['commit', '-m', '1: added symlink link1'])
741
742
mkdir('d1')
743
runbzr('add d1')
744
assert self.capture('unknowns') == ''
745
os.symlink("NOWHERE2", "d1/link2")
746
assert self.capture('unknowns') == 'd1/link2\n'
747
# is d1/link2 found when adding d1
748
runbzr('add d1')
749
assert self.capture('unknowns') == ''
750
os.symlink("NOWHERE3", "d1/link3")
751
assert self.capture('unknowns') == 'd1/link3\n'
752
runbzr(['commit', '-m', '2: added dir, symlink'])
753
754
runbzr('rename d1 d2')
755
runbzr('move d2/link2 .')
756
runbzr('move link1 d2')
757
assert os.readlink("./link2") == "NOWHERE2"
758
assert os.readlink("d2/link1") == "NOWHERE1"
759
runbzr('add d2/link3')
760
runbzr('diff')
761
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
762
763
os.unlink("link2")
764
os.symlink("TARGET 2", "link2")
765
os.unlink("d2/link1")
766
os.symlink("TARGET 1", "d2/link1")
767
runbzr('diff')
768
assert self.capture("relpath d2/link1") == "d2/link1\n"
769
runbzr(['commit', '-m', '4: retarget of two links'])
770
771
runbzr('remove d2/link1')
772
assert self.capture('unknowns') == 'd2/link1\n'
773
runbzr(['commit', '-m', '5: remove d2/link1'])
774
# try with the rm alias
775
runbzr('add d2/link1')
776
runbzr(['commit', '-m', '6: add d2/link1'])
777
runbzr('rm d2/link1')
778
assert self.capture('unknowns') == 'd2/link1\n'
779
runbzr(['commit', '-m', '7: remove d2/link1'])
780
781
os.mkdir("d1")
782
runbzr('add d1')
783
runbzr('rename d2/link3 d1/link3new')
784
assert self.capture('unknowns') == 'd2/link1\n'
785
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
786
787
runbzr(['check'])
788
789
runbzr(['export', '-r', '1', 'exp1.tmp'])
790
chdir("exp1.tmp")
791
assert listdir_sorted(".") == [ "link1" ]
792
assert os.readlink("link1") == "NOWHERE1"
793
chdir("..")
794
795
runbzr(['export', '-r', '2', 'exp2.tmp'])
796
chdir("exp2.tmp")
797
assert listdir_sorted(".") == [ "d1", "link1" ]
798
chdir("..")
799
800
runbzr(['export', '-r', '3', 'exp3.tmp'])
801
chdir("exp3.tmp")
802
assert listdir_sorted(".") == [ "d2", "link2" ]
803
assert listdir_sorted("d2") == [ "link1", "link3" ]
804
assert os.readlink("d2/link1") == "NOWHERE1"
805
assert os.readlink("link2") == "NOWHERE2"
806
chdir("..")
807
808
runbzr(['export', '-r', '4', 'exp4.tmp'])
809
chdir("exp4.tmp")
810
assert listdir_sorted(".") == [ "d2", "link2" ]
811
assert os.readlink("d2/link1") == "TARGET 1"
812
assert os.readlink("link2") == "TARGET 2"
813
assert listdir_sorted("d2") == [ "link1", "link3" ]
814
chdir("..")
815
816
runbzr(['export', '-r', '5', 'exp5.tmp'])
817
chdir("exp5.tmp")
818
assert listdir_sorted(".") == [ "d2", "link2" ]
819
assert os.path.islink("link2")
820
assert listdir_sorted("d2")== [ "link3" ]
821
chdir("..")
822
823
runbzr(['export', '-r', '8', 'exp6.tmp'])
824
chdir("exp6.tmp")
825
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
826
assert listdir_sorted("d1") == [ "link3new" ]
827
assert listdir_sorted("d2") == []
828
assert os.readlink("d1/link3new") == "NOWHERE3"
829
chdir("..")
830
else:
831
progress("skipping symlink tests")
832
833
834
class HttpTests(TestCaseWithWebserver):
835
"""Test bzr ui commands against remote branches."""
836
837
def test_branch(self):
838
os.mkdir('from')
839
branch = Branch.initialize('from')
840
branch.commit('empty commit for nonsense', allow_pointless=True)
841
url = self.get_remote_url('from')
842
self.run_bzr('branch', url, 'to')
843
branch = Branch.open('to')
844
self.assertEqual(1, len(branch.revision_history()))
845
846
def test_log(self):
847
self.build_tree(['branch/', 'branch/file'])
848
branch = Branch.initialize('branch')
849
branch.add(['file'])
850
branch.commit('add file', rev_id='A')
851
url = self.get_remote_url('branch/file')
852
output = self.capture('log %s' % url)
853
self.assertEqual(7, len(output.split('\n')))
364
854
365
file('hello', 'wt').write('bar')
366
self.runbzr('revert hello')
367
self.check_file_contents('hello', 'foo')
855
856
368
857
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0