~bzr-pqm/bzr/bzr.dev
» Revision
1122
(compared to revision 1185.16.85)
: bzrlib/selftest/blackbox.py
« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 1122
- compare with another revision
- download diff
- download tarball
- view history from revision 1122
- Committer: Martin Pool
- Date: 2005-08-26 07:15:43 UTC
- Revision ID: mbp@sourcefrog.net-20050826071543-192d3828a8207abc
- only delete the test scratch directory if it was created
- files added:
- bzrlib/meta_store.py
- files removed:
- INSTALL
- bzrlib/store
- bzrlib/transport
- files renamed:
- contrib/newinventory.py => bzrlib/newinventory.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- bzrlib/store/__init__.py => bzrlib/store.py
- bzrlib/upgrade.py => tools/history2weaves.py
- bzrlib/selftest/test_weave.py => tools/testweave.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. This doesn't actually run a new interpreter but
23
rather starts again from the run_bzr function.
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.
24
27
"""
25
28
26
27
from cStringIO import StringIO
28
import os
29
import re
30
import shutil
31
29
import sys
32
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):
30
from bzrlib.selftest import InTempDir, BzrTestBase
31
32
33
class ExternalBase(InTempDir):
34
35
def runbzr(self, args, retcode=0,backtick=False):
36
try:
37
import shutil
38
from subprocess import call
39
except ImportError, e:
40
_need_subprocess()
41
raise
42
44
43
if isinstance(args, basestring):
45
44
args = args.split()
46
45
47
46
if backtick:
48
return self.run_bzr_captured(args, retcode=retcode)[0]
47
return self.backtick(['python', self.BZRPATH,] + args,
48
retcode=retcode)
49
49
else:
50
return self.run_bzr_captured(args, retcode=retcode)
51
50
return self.runcmd(['python', self.BZRPATH,] + args,
51
retcode=retcode)
52
52
53
53
class TestCommands(ExternalBase):
54
54
60
60
self.runbzr('commit -h')
61
61
62
62
def test_init_branch(self):
63
import os
63
64
self.runbzr(['init'])
64
65
65
66
def test_whoami(self):
76
77
f = file('.bzr/email', 'wt')
77
78
f.write('Branch Identity <branch@identi.ty>')
78
79
f.close()
79
bzr_email = os.environ.get('BZREMAIL')
80
if bzr_email is not None:
81
del os.environ['BZREMAIL']
82
80
whoami = self.runbzr("whoami",backtick=True)
83
81
whoami_email = self.runbzr("whoami --email",backtick=True)
84
82
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
85
83
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
84
96
85
def test_invalid_commands(self):
97
86
self.runbzr("pants", retcode=1)
105
94
self.runbzr("add hello.txt")
106
95
self.runbzr("commit -m added")
107
96
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
97
def test_ignore_patterns(self):
115
98
from bzrlib.branch import Branch
116
99
117
b = Branch.initialize('.')
100
b = Branch('.', init=True)
118
101
self.assertEquals(list(b.unknowns()), [])
119
102
120
103
file('foo.tmp', 'wt').write('tmp files are ignored')
121
104
self.assertEquals(list(b.unknowns()), [])
122
assert self.capture('unknowns') == ''
105
assert self.backtick('bzr unknowns') == ''
123
106
124
107
file('foo.c', 'wt').write('int main() {}')
125
108
self.assertEquals(list(b.unknowns()), ['foo.c'])
126
assert self.capture('unknowns') == 'foo.c\n'
109
assert self.backtick('bzr unknowns') == 'foo.c\n'
127
110
128
111
self.runbzr(['add', 'foo.c'])
129
assert self.capture('unknowns') == ''
112
assert self.backtick('bzr unknowns') == ''
130
113
131
114
# 'ignore' works when creating the .bzignore file
132
115
file('foo.blah', 'wt').write('blah')
133
116
self.assertEquals(list(b.unknowns()), ['foo.blah'])
134
117
self.runbzr('ignore *.blah')
135
118
self.assertEquals(list(b.unknowns()), [])
136
assert file('.bzrignore', 'rU').read() == '*.blah\n'
119
assert file('.bzrignore', 'rb').read() == '*.blah\n'
137
120
138
121
# 'ignore' works when then .bzrignore file already exists
139
122
file('garh', 'wt').write('garh')
140
123
self.assertEquals(list(b.unknowns()), ['garh'])
141
assert self.capture('unknowns') == 'garh\n'
124
assert self.backtick('bzr unknowns') == 'garh\n'
142
125
self.runbzr('ignore garh')
143
126
self.assertEquals(list(b.unknowns()), [])
144
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
127
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
145
128
146
129
def test_revert(self):
130
import os
131
147
132
self.runbzr('init')
148
133
149
134
file('hello', 'wt').write('foo')
153
138
file('goodbye', 'wt').write('baz')
154
139
self.runbzr('add goodbye')
155
140
self.runbzr('commit -m setup goodbye')
156
141
157
142
file('hello', 'wt').write('bar')
158
143
file('goodbye', 'wt').write('qux')
159
144
self.runbzr('revert hello')
168
153
os.rmdir('revertdir')
169
154
self.runbzr('revert')
170
155
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):
156
157
def skipped_test_mv_modes(self):
195
158
"""Test two modes of operation for mv"""
196
159
from bzrlib.branch import Branch
197
b = Branch.initialize('.')
160
b = Branch('.', init=True)
198
161
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'])
162
self.run_bzr('mv', 'a', 'b')
163
self.run_bzr('mv', 'b', 'subdir')
164
self.run_bzr('mv', 'subdir/b', 'a')
165
self.run_bzr('mv', 'a', 'b', 'subdir')
166
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
205
167
206
168
def test_main_version(self):
207
169
"""Check output from version command and master option is reasonable"""
218
180
self.log(tmp_output)
219
181
self.assertEquals(output, tmp_output)
220
182
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')
330
self.check_file_contents('goodbye', 'quux')
331
# Merging a branch pulls its revision into the tree
332
a = Branch.open('.')
333
b = Branch.open('../b')
334
a.get_revision_xml(b.last_revision())
335
self.log('pending merges: %s', a.pending_merges())
336
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
337
# % (a.pending_merges(), b.last_patch())
338
339
def test_merge_with_missing_file(self):
340
"""Merge handles missing file conflicts"""
341
os.mkdir('a')
342
os.chdir('a')
343
os.mkdir('sub')
344
print >> file('sub/a.txt', 'wb'), "hello"
345
print >> file('b.txt', 'wb'), "hello"
346
print >> file('sub/c.txt', 'wb'), "hello"
347
self.runbzr('init')
348
self.runbzr('add')
349
self.runbzr(('commit', '-m', 'added a'))
350
self.runbzr('branch . ../b')
351
print >> file('sub/a.txt', 'ab'), "there"
352
print >> file('b.txt', 'ab'), "there"
353
print >> file('sub/c.txt', 'ab'), "there"
354
self.runbzr(('commit', '-m', 'Added there'))
355
os.unlink('sub/a.txt')
356
os.unlink('sub/c.txt')
357
os.rmdir('sub')
358
os.unlink('b.txt')
359
self.runbzr(('commit', '-m', 'Removed a.txt'))
360
os.chdir('../b')
361
print >> file('sub/a.txt', 'ab'), "something"
362
print >> file('b.txt', 'ab'), "something"
363
print >> file('sub/c.txt', 'ab'), "something"
364
self.runbzr(('commit', '-m', 'Modified a.txt'))
365
self.runbzr('merge ../a/')
366
assert os.path.exists('sub/a.txt.THIS')
367
assert os.path.exists('sub/a.txt.BASE')
368
os.chdir('../a')
369
self.runbzr('merge ../b/')
370
assert os.path.exists('sub/a.txt.OTHER')
371
assert os.path.exists('sub/a.txt.BASE')
372
373
def test_pull(self):
374
"""Pull changes from one branch to another."""
375
os.mkdir('a')
376
os.chdir('a')
377
378
self.example_branch()
379
self.runbzr('pull', retcode=1)
380
self.runbzr('missing', retcode=1)
381
self.runbzr('missing .')
382
self.runbzr('missing')
383
self.runbzr('pull')
384
self.runbzr('pull /', retcode=1)
385
self.runbzr('pull')
386
387
os.chdir('..')
388
self.runbzr('branch a b')
389
os.chdir('b')
390
self.runbzr('pull')
391
os.mkdir('subdir')
392
self.runbzr('add subdir')
393
self.runbzr('commit -m blah --unchanged')
394
os.chdir('../a')
395
a = Branch.open('.')
396
b = Branch.open('../b')
397
assert a.revision_history() == b.revision_history()[:-1]
398
self.runbzr('pull ../b')
399
assert a.revision_history() == b.revision_history()
400
self.runbzr('commit -m blah2 --unchanged')
401
os.chdir('../b')
402
self.runbzr('commit -m blah3 --unchanged')
403
# no clobber
404
self.runbzr('pull ../a', retcode=1)
405
os.chdir('..')
406
self.runbzr('branch b clobberme')
407
os.chdir('clobberme')
408
self.runbzr('pull --clobber ../a')
409
clobbered = Branch.open('.')
410
self.assertEqual(clobbered.revision_history(),
411
a.revision_history())
412
os.chdir('../a')
413
self.runbzr('merge ../b')
414
self.runbzr('commit -m blah4 --unchanged')
415
os.chdir('../b/subdir')
416
self.runbzr('pull ../../a')
417
assert a.revision_history()[-1] == b.revision_history()[-1]
418
self.runbzr('commit -m blah5 --unchanged')
419
self.runbzr('commit -m blah6 --unchanged')
420
os.chdir('..')
421
self.runbzr('pull ../a')
422
os.chdir('../a')
423
self.runbzr('commit -m blah7 --unchanged')
424
self.runbzr('merge ../b')
425
self.runbzr('commit -m blah8 --unchanged')
426
self.runbzr('pull ../b')
427
self.runbzr('pull ../b')
428
429
def test_locations(self):
430
"""Using and remembering different locations"""
431
os.mkdir('a')
432
os.chdir('a')
433
self.runbzr('init')
434
self.runbzr('commit -m unchanged --unchanged')
435
self.runbzr('pull', retcode=1)
436
self.runbzr('merge', retcode=1)
437
self.runbzr('branch . ../b')
438
os.chdir('../b')
439
self.runbzr('pull')
440
self.runbzr('branch . ../c')
441
self.runbzr('pull ../c')
442
self.runbzr('merge')
443
os.chdir('../a')
444
self.runbzr('pull ../b')
445
self.runbzr('pull')
446
self.runbzr('pull ../c')
447
self.runbzr('branch ../c ../d')
448
shutil.rmtree('../c')
449
self.runbzr('pull')
450
os.chdir('../b')
451
self.runbzr('pull')
452
os.chdir('../d')
453
self.runbzr('pull', retcode=1)
454
self.runbzr('pull ../a --remember')
455
self.runbzr('pull')
456
457
def test_add_reports(self):
458
"""add command prints the names of added files."""
459
b = Branch.initialize('.')
460
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
461
out = self.run_bzr_captured(['add'], retcode = 0)[0]
462
# the ordering is not defined at the moment
463
results = sorted(out.rstrip('\n').split('\n'))
464
self.assertEquals(['added dir',
465
'added dir'+os.sep+'sub.txt',
466
'added top.txt',],
467
results)
468
469
def test_add_quiet_is(self):
470
"""add -q does not print the names of added files."""
471
b = Branch.initialize('.')
472
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
473
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
474
# the ordering is not defined at the moment
475
results = sorted(out.rstrip('\n').split('\n'))
476
self.assertEquals([''], results)
477
478
def test_unknown_command(self):
479
"""Handling of unknown command."""
480
out, err = self.run_bzr_captured(['fluffy-badger'],
481
retcode=1)
482
self.assertEquals(out, '')
483
err.index('unknown command')
484
485
def test_conflicts(self):
486
"""Handling of merge conflicts"""
487
os.mkdir('base')
488
os.chdir('base')
489
file('hello', 'wb').write("hi world")
490
file('answer', 'wb').write("42")
491
self.runbzr('init')
492
self.runbzr('add')
493
self.runbzr('commit -m base')
494
self.runbzr('branch . ../other')
495
self.runbzr('branch . ../this')
496
os.chdir('../other')
497
file('hello', 'wb').write("Hello.")
498
file('answer', 'wb').write("Is anyone there?")
499
self.runbzr('commit -m other')
500
os.chdir('../this')
501
file('hello', 'wb').write("Hello, world")
502
self.runbzr('mv answer question')
503
file('question', 'wb').write("What do you get when you multiply six"
504
"times nine?")
505
self.runbzr('commit -m this')
506
self.runbzr('merge ../other')
507
result = self.runbzr('conflicts', backtick=1)
508
self.assertEquals(result, "hello\nquestion\n")
509
result = self.runbzr('status', backtick=1)
510
assert "conflicts:\n hello\n question\n" in result, result
511
self.runbzr('resolve hello')
512
result = self.runbzr('conflicts', backtick=1)
513
self.assertEquals(result, "question\n")
514
self.runbzr('commit -m conflicts', retcode=1)
515
self.runbzr('resolve --all')
516
result = self.runbzr('conflicts', backtick=1)
517
self.runbzr('commit -m conflicts')
518
self.assertEquals(result, "")
519
520
def test_resign(self):
521
"""Test re signing of data."""
522
import bzrlib.gpg
523
oldstrategy = bzrlib.gpg.GPGStrategy
524
branch = Branch.initialize('.')
525
branch.commit("base", allow_pointless=True, rev_id='A')
526
try:
527
# monkey patch gpg signing mechanism
528
from bzrlib.testament import Testament
529
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
530
self.runbzr('re-sign -r revid:A')
531
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
532
branch.revision_store.get('A', 'sig').read())
533
finally:
534
bzrlib.gpg.GPGStrategy = oldstrategy
535
536
def listdir_sorted(dir):
537
L = os.listdir(dir)
538
L.sort()
539
return L
540
541
542
183
class OldTests(ExternalBase):
543
"""old tests moved from ./testbzr."""
544
184
# old tests moved from ./testbzr
545
185
def test_bzr(self):
546
186
from os import chdir, mkdir
547
187
from os.path import exists
188
import os
548
189
549
190
runbzr = self.runbzr
550
capture = self.capture
191
backtick = self.backtick
551
192
progress = self.log
552
193
553
194
progress("basic branch creation")
555
196
chdir('branch1')
556
197
runbzr('init')
557
198
558
self.assertEquals(capture('root').rstrip(),
199
self.assertEquals(backtick('bzr root').rstrip(),
559
200
os.path.join(self.test_dir, 'branch1'))
560
201
561
202
progress("status of new file")
564
205
f.write('hello world!\n')
565
206
f.close()
566
207
567
self.assertEquals(capture('unknowns'), 'test.txt\n')
208
out = backtick("bzr unknowns")
209
self.assertEquals(out, 'test.txt\n')
568
210
569
out = capture("status")
211
out = backtick("bzr status")
570
212
assert out == 'unknown:\n test.txt\n'
571
213
572
out = capture("status --all")
214
out = backtick("bzr status --all")
573
215
assert out == "unknown:\n test.txt\n"
574
216
575
out = capture("status test.txt --all")
217
out = backtick("bzr status test.txt --all")
576
218
assert out == "unknown:\n test.txt\n"
577
219
578
220
f = file('test2.txt', 'wt')
579
221
f.write('goodbye cruel world...\n')
580
222
f.close()
581
223
582
out = capture("status test.txt")
224
out = backtick("bzr status test.txt")
583
225
assert out == "unknown:\n test.txt\n"
584
226
585
out = capture("status")
227
out = backtick("bzr status")
586
228
assert out == ("unknown:\n"
587
229
" test.txt\n"
588
230
" test2.txt\n")
590
232
os.unlink('test2.txt')
591
233
592
234
progress("command aliases")
593
out = capture("st --all")
235
out = backtick("bzr st --all")
594
236
assert out == ("unknown:\n"
595
237
" test.txt\n")
596
238
597
out = capture("stat")
239
out = backtick("bzr stat")
598
240
assert out == ("unknown:\n"
599
241
" test.txt\n")
600
242
604
246
runbzr("help commands")
605
247
runbzr("help slartibartfast", 1)
606
248
607
out = capture("help ci")
249
out = backtick("bzr help ci")
608
250
out.index('aliases: ')
609
251
610
252
progress("can't rename unversioned file")
613
255
progress("adding a file")
614
256
615
257
runbzr("add test.txt")
616
assert capture("unknowns") == ''
617
assert capture("status --all") == ("added:\n"
258
assert backtick("bzr unknowns") == ''
259
assert backtick("bzr status --all") == ("added:\n"
618
260
" test.txt\n")
619
261
620
262
progress("rename newly-added file")
622
264
assert os.path.exists("hello.txt")
623
265
assert not os.path.exists("test.txt")
624
266
625
assert capture("revno") == '0\n'
267
assert backtick("bzr revno") == '0\n'
626
268
627
269
progress("add first revision")
628
270
runbzr(['commit', '-m', 'add first revision'])
636
278
runbzr("add sub1")
637
279
runbzr("rename sub1 sub2")
638
280
runbzr("move hello.txt sub2")
639
self.assertEqual(capture("relpath sub2/hello.txt"),
640
os.path.join("sub2", "hello.txt\n"))
281
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
641
282
642
283
assert exists("sub2")
643
284
assert exists("sub2/hello.txt")
658
299
runbzr(['commit', '-m', 'rename nested subdirectories'])
659
300
660
301
chdir('sub1/sub2')
661
self.assertEquals(capture('root')[:-1],
302
self.assertEquals(backtick('bzr root')[:-1],
662
303
os.path.join(self.test_dir, 'branch1'))
663
304
runbzr('move ../hello.txt .')
664
305
assert exists('./hello.txt')
665
self.assertEquals(capture('relpath hello.txt'),
666
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
667
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
306
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
307
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
668
308
runbzr(['commit', '-m', 'move to parent directory'])
669
309
chdir('..')
670
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
310
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
671
311
672
312
runbzr('move sub2/hello.txt .')
673
313
assert exists('hello.txt')
677
317
f.close()
678
318
679
319
f = file('msg.tmp', 'wt')
680
f.write('this is my new commit\nand it has multiple lines, for fun')
320
f.write('this is my new commit\n')
681
321
f.close()
682
322
683
323
runbzr('commit -F msg.tmp')
684
324
685
assert capture('revno') == '5\n'
325
assert backtick('bzr revno') == '5\n'
686
326
runbzr('export -r 5 export-5.tmp')
687
327
runbzr('export export.tmp')
688
328
690
330
runbzr('log -v')
691
331
runbzr('log -v --forward')
692
332
runbzr('log -m', retcode=1)
693
log_out = capture('log -m commit')
694
assert "this is my new commit\n and" in log_out
333
log_out = backtick('bzr log -m commit')
334
assert "this is my new commit" in log_out
695
335
assert "rename nested" not in log_out
696
336
assert 'revision-id' not in log_out
697
assert 'revision-id' in capture('log --show-ids -m commit')
698
699
log_out = capture('log --line')
700
for line in log_out.splitlines():
701
assert len(line) <= 79, len(line)
702
assert "this is my new commit and" in log_out
337
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
703
338
704
339
705
340
progress("file with spaces in name")
715
350
716
351
runbzr('info')
717
352
718
if has_symlinks():
719
progress("symlinks")
720
mkdir('symlinks')
721
chdir('symlinks')
722
runbzr('init')
723
os.symlink("NOWHERE1", "link1")
724
runbzr('add link1')
725
assert self.capture('unknowns') == ''
726
runbzr(['commit', '-m', '1: added symlink link1'])
727
728
mkdir('d1')
729
runbzr('add d1')
730
assert self.capture('unknowns') == ''
731
os.symlink("NOWHERE2", "d1/link2")
732
assert self.capture('unknowns') == 'd1/link2\n'
733
# is d1/link2 found when adding d1
734
runbzr('add d1')
735
assert self.capture('unknowns') == ''
736
os.symlink("NOWHERE3", "d1/link3")
737
assert self.capture('unknowns') == 'd1/link3\n'
738
runbzr(['commit', '-m', '2: added dir, symlink'])
739
740
runbzr('rename d1 d2')
741
runbzr('move d2/link2 .')
742
runbzr('move link1 d2')
743
assert os.readlink("./link2") == "NOWHERE2"
744
assert os.readlink("d2/link1") == "NOWHERE1"
745
runbzr('add d2/link3')
746
runbzr('diff')
747
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
748
749
os.unlink("link2")
750
os.symlink("TARGET 2", "link2")
751
os.unlink("d2/link1")
752
os.symlink("TARGET 1", "d2/link1")
753
runbzr('diff')
754
assert self.capture("relpath d2/link1") == "d2/link1\n"
755
runbzr(['commit', '-m', '4: retarget of two links'])
756
757
runbzr('remove d2/link1')
758
assert self.capture('unknowns') == 'd2/link1\n'
759
runbzr(['commit', '-m', '5: remove d2/link1'])
760
# try with the rm alias
761
runbzr('add d2/link1')
762
runbzr(['commit', '-m', '6: add d2/link1'])
763
runbzr('rm d2/link1')
764
assert self.capture('unknowns') == 'd2/link1\n'
765
runbzr(['commit', '-m', '7: remove d2/link1'])
766
767
os.mkdir("d1")
768
runbzr('add d1')
769
runbzr('rename d2/link3 d1/link3new')
770
assert self.capture('unknowns') == 'd2/link1\n'
771
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
772
773
runbzr(['check'])
774
775
runbzr(['export', '-r', '1', 'exp1.tmp'])
776
chdir("exp1.tmp")
777
assert listdir_sorted(".") == [ "link1" ]
778
assert os.readlink("link1") == "NOWHERE1"
779
chdir("..")
780
781
runbzr(['export', '-r', '2', 'exp2.tmp'])
782
chdir("exp2.tmp")
783
assert listdir_sorted(".") == [ "d1", "link1" ]
784
chdir("..")
785
786
runbzr(['export', '-r', '3', 'exp3.tmp'])
787
chdir("exp3.tmp")
788
assert listdir_sorted(".") == [ "d2", "link2" ]
789
assert listdir_sorted("d2") == [ "link1", "link3" ]
790
assert os.readlink("d2/link1") == "NOWHERE1"
791
assert os.readlink("link2") == "NOWHERE2"
792
chdir("..")
793
794
runbzr(['export', '-r', '4', 'exp4.tmp'])
795
chdir("exp4.tmp")
796
assert listdir_sorted(".") == [ "d2", "link2" ]
797
assert os.readlink("d2/link1") == "TARGET 1"
798
assert os.readlink("link2") == "TARGET 2"
799
assert listdir_sorted("d2") == [ "link1", "link3" ]
800
chdir("..")
801
802
runbzr(['export', '-r', '5', 'exp5.tmp'])
803
chdir("exp5.tmp")
804
assert listdir_sorted(".") == [ "d2", "link2" ]
805
assert os.path.islink("link2")
806
assert listdir_sorted("d2")== [ "link3" ]
807
chdir("..")
808
809
runbzr(['export', '-r', '8', 'exp6.tmp'])
810
chdir("exp6.tmp")
811
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
812
assert listdir_sorted("d1") == [ "link3new" ]
813
assert listdir_sorted("d2") == []
814
assert os.readlink("d1/link3new") == "NOWHERE3"
815
chdir("..")
816
else:
817
progress("skipping symlink tests")
818
819
820
class HttpTests(TestCaseWithWebserver):
821
"""Test bzr ui commands against remote branches."""
822
823
def test_branch(self):
824
os.mkdir('from')
825
branch = Branch.initialize('from')
826
branch.commit('empty commit for nonsense', allow_pointless=True)
827
url = self.get_remote_url('from')
828
self.run_bzr('branch', url, 'to')
829
branch = Branch.open('to')
830
self.assertEqual(1, len(branch.revision_history()))
831
832
def test_log(self):
833
self.build_tree(['branch/', 'branch/file'])
834
branch = Branch.initialize('branch')
835
branch.add(['file'])
836
branch.commit('add file', rev_id='A')
837
url = self.get_remote_url('branch/file')
838
output = self.capture('log %s' % url)
839
self.assertEqual(7, len(output.split('\n')))
840
841
842
353
354
355
def example_branch(test):
356
test.runbzr('init')
357
358
file('hello', 'wt').write('foo')
359
test.runbzr('add hello')
360
test.runbzr('commit -m setup hello')
361
362
file('goodbye', 'wt').write('baz')
363
test.runbzr('add goodbye')
364
test.runbzr('commit -m setup goodbye')
365
366
367
class RevertCommand(ExternalBase):
368
def runTest(self):
369
example_branch(self)
370
file('hello', 'wt').write('bar')
371
file('goodbye', 'wt').write('qux')
372
self.runbzr('revert hello')
373
self.check_file_contents('hello', 'foo')
374
self.check_file_contents('goodbye', 'qux')
375
self.runbzr('revert')
376
self.check_file_contents('goodbye', 'baz')
377
378
379
class MergeCommand(ExternalBase):
380
def runTest(self):
381
from bzrlib.branch import Branch
382
import os
383
os.mkdir('a')
384
os.chdir('a')
385
example_branch(self)
386
os.chdir('..')
387
self.runbzr('branch a b')
388
os.chdir('b')
389
file('goodbye', 'wt').write('quux')
390
self.runbzr(['commit', '-m', "more u's are always good"])
391
392
os.chdir('../a')
393
file('hello', 'wt').write('quuux')
394
# We can't merge when there are in-tree changes
395
self.runbzr('merge ../b', retcode=1)
396
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
397
self.runbzr('merge ../b')
398
self.check_file_contents('goodbye', 'quux')
399
# Merging a branch pulls its revision into the tree
400
a = Branch('.')
401
b = Branch('../b')
402
a.get_revision_xml(b.last_patch())
403
print "Pending: %s" % a.pending_merges()
404
# assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
405
# % (a.pending_merges(), b.last_patch())
843
406
Loggerhead is a web-based interface for Breezy
Version: 2.0.1