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 1479
- compare with another revision
- download diff
- download tarball
- view history from revision 1479
- Committer: Robert Collins
- Date: 2005-10-23 11:46:19 UTC
- Revision ID: robertc@robertcollins.net-20051023114619-cec8ca25207b1344
More quoting at the transport layer bugfixes.
- 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.assertFileEqual('b\n', 'b/.bzr/branch-name')
302
self.runbzr('branch a c -r 1')
303
os.chdir('b')
304
self.runbzr('commit -m foo --unchanged')
305
os.chdir('..')
306
# naughty - abstraction violations RBC 20050928
307
print "test_branch used to delete the stores, how is this meant to work ?"
308
#shutil.rmtree('a/.bzr/revision-store')
309
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
310
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
311
self.runbzr('branch a d --basis b')
312
313
def test_merge(self):
314
from bzrlib.branch import Branch
315
316
os.mkdir('a')
317
os.chdir('a')
318
self.example_branch()
319
os.chdir('..')
320
self.runbzr('branch a b')
321
os.chdir('b')
322
file('goodbye', 'wt').write('quux')
323
self.runbzr(['commit', '-m', "more u's are always good"])
324
325
os.chdir('../a')
326
file('hello', 'wt').write('quuux')
327
# We can't merge when there are in-tree changes
328
self.runbzr('merge ../b', retcode=1)
329
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
330
self.runbzr('merge ../b -r last:1..last:1')
331
self.runbzr('revert --no-backup')
332
self.runbzr('merge ../b -r last:1')
333
self.check_file_contents('goodbye', 'quux')
334
# Merging a branch pulls its revision into the tree
335
a = Branch.open('.')
336
b = Branch.open('../b')
337
a.get_revision_xml(b.last_revision())
338
self.log('pending merges: %s', a.pending_merges())
339
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
340
# % (a.pending_merges(), b.last_patch())
341
342
def test_merge_with_missing_file(self):
343
"""Merge handles missing file conflicts"""
344
os.mkdir('a')
345
os.chdir('a')
346
os.mkdir('sub')
347
print >> file('sub/a.txt', 'wb'), "hello"
348
print >> file('b.txt', 'wb'), "hello"
349
print >> file('sub/c.txt', 'wb'), "hello"
350
self.runbzr('init')
351
self.runbzr('add')
352
self.runbzr(('commit', '-m', 'added a'))
353
self.runbzr('branch . ../b')
354
print >> file('sub/a.txt', 'ab'), "there"
355
print >> file('b.txt', 'ab'), "there"
356
print >> file('sub/c.txt', 'ab'), "there"
357
self.runbzr(('commit', '-m', 'Added there'))
358
os.unlink('sub/a.txt')
359
os.unlink('sub/c.txt')
360
os.rmdir('sub')
361
os.unlink('b.txt')
362
self.runbzr(('commit', '-m', 'Removed a.txt'))
363
os.chdir('../b')
364
print >> file('sub/a.txt', 'ab'), "something"
365
print >> file('b.txt', 'ab'), "something"
366
print >> file('sub/c.txt', 'ab'), "something"
367
self.runbzr(('commit', '-m', 'Modified a.txt'))
368
self.runbzr('merge ../a/', retcode=1)
369
assert os.path.exists('sub/a.txt.THIS')
370
assert os.path.exists('sub/a.txt.BASE')
371
os.chdir('../a')
372
self.runbzr('merge ../b/', retcode=1)
373
assert os.path.exists('sub/a.txt.OTHER')
374
assert os.path.exists('sub/a.txt.BASE')
375
376
def test_pull(self):
377
"""Pull changes from one branch to another."""
378
os.mkdir('a')
379
os.chdir('a')
380
381
self.example_branch()
382
self.runbzr('pull', retcode=1)
383
self.runbzr('missing', retcode=1)
384
self.runbzr('missing .')
385
self.runbzr('missing')
386
self.runbzr('pull')
387
self.runbzr('pull /', retcode=1)
388
self.runbzr('pull')
389
390
os.chdir('..')
391
self.runbzr('branch a b')
392
os.chdir('b')
393
self.runbzr('pull')
394
os.mkdir('subdir')
395
self.runbzr('add subdir')
396
self.runbzr('commit -m blah --unchanged')
397
os.chdir('../a')
398
a = Branch.open('.')
399
b = Branch.open('../b')
400
assert a.revision_history() == b.revision_history()[:-1]
401
self.runbzr('pull ../b')
402
assert a.revision_history() == b.revision_history()
403
self.runbzr('commit -m blah2 --unchanged')
404
os.chdir('../b')
405
self.runbzr('commit -m blah3 --unchanged')
406
# no clobber
407
self.runbzr('pull ../a', retcode=1)
408
os.chdir('..')
409
self.runbzr('branch b clobberme')
410
os.chdir('clobberme')
411
self.runbzr('pull --clobber ../a')
412
clobbered = Branch.open('.')
413
self.assertEqual(clobbered.revision_history(),
414
a.revision_history())
415
os.chdir('../a')
416
self.runbzr('merge ../b')
417
self.runbzr('commit -m blah4 --unchanged')
418
os.chdir('../b/subdir')
419
self.runbzr('pull ../../a')
420
assert a.revision_history()[-1] == b.revision_history()[-1]
421
self.runbzr('commit -m blah5 --unchanged')
422
self.runbzr('commit -m blah6 --unchanged')
423
os.chdir('..')
424
self.runbzr('pull ../a')
425
os.chdir('../a')
426
self.runbzr('commit -m blah7 --unchanged')
427
self.runbzr('merge ../b')
428
self.runbzr('commit -m blah8 --unchanged')
429
self.runbzr('pull ../b')
430
self.runbzr('pull ../b')
431
432
def test_locations(self):
433
"""Using and remembering different locations"""
434
os.mkdir('a')
435
os.chdir('a')
436
self.runbzr('init')
437
self.runbzr('commit -m unchanged --unchanged')
438
self.runbzr('pull', retcode=1)
439
self.runbzr('merge', retcode=1)
440
self.runbzr('branch . ../b')
441
os.chdir('../b')
442
self.runbzr('pull')
443
self.runbzr('branch . ../c')
444
self.runbzr('pull ../c')
445
self.runbzr('merge')
446
os.chdir('../a')
447
self.runbzr('pull ../b')
448
self.runbzr('pull')
449
self.runbzr('pull ../c')
450
self.runbzr('branch ../c ../d')
451
shutil.rmtree('../c')
452
self.runbzr('pull')
453
os.chdir('../b')
454
self.runbzr('pull')
455
os.chdir('../d')
456
self.runbzr('pull', retcode=1)
457
self.runbzr('pull ../a --remember')
458
self.runbzr('pull')
459
460
def test_add_reports(self):
461
"""add command prints the names of added files."""
462
b = Branch.initialize('.')
463
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
464
out = self.run_bzr_captured(['add'], retcode = 0)[0]
465
# the ordering is not defined at the moment
466
results = sorted(out.rstrip('\n').split('\n'))
467
self.assertEquals(['added dir',
468
'added dir'+os.sep+'sub.txt',
469
'added top.txt',],
470
results)
471
472
def test_add_quiet_is(self):
473
"""add -q does not print the names of added files."""
474
b = Branch.initialize('.')
475
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
476
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
477
# the ordering is not defined at the moment
478
results = sorted(out.rstrip('\n').split('\n'))
479
self.assertEquals([''], results)
480
481
def test_unknown_command(self):
482
"""Handling of unknown command."""
483
out, err = self.run_bzr_captured(['fluffy-badger'],
484
retcode=1)
485
self.assertEquals(out, '')
486
err.index('unknown command')
487
488
def test_conflicts(self):
489
"""Handling of merge conflicts"""
490
os.mkdir('base')
491
os.chdir('base')
492
file('hello', 'wb').write("hi world")
493
file('answer', 'wb').write("42")
494
self.runbzr('init')
495
self.runbzr('add')
496
self.runbzr('commit -m base')
497
self.runbzr('branch . ../other')
498
self.runbzr('branch . ../this')
499
os.chdir('../other')
500
file('hello', 'wb').write("Hello.")
501
file('answer', 'wb').write("Is anyone there?")
502
self.runbzr('commit -m other')
503
os.chdir('../this')
504
file('hello', 'wb').write("Hello, world")
505
self.runbzr('mv answer question')
506
file('question', 'wb').write("What do you get when you multiply six"
507
"times nine?")
508
self.runbzr('commit -m this')
509
self.runbzr('merge ../other --show-base', retcode=1)
510
conflict_text = file('hello').read()
511
assert '<<<<<<<' in conflict_text
512
assert '>>>>>>>' in conflict_text
513
assert '=======' in conflict_text
514
assert '|||||||' in conflict_text
515
assert 'hi world' in conflict_text
516
self.runbzr('revert')
517
self.runbzr('resolve --all')
518
self.runbzr('merge ../other', retcode=1)
519
conflict_text = file('hello').read()
520
assert '|||||||' not in conflict_text
521
assert 'hi world' not in conflict_text
522
result = self.runbzr('conflicts', backtick=1)
523
self.assertEquals(result, "hello\nquestion\n")
524
result = self.runbzr('status', backtick=1)
525
assert "conflicts:\n hello\n question\n" in result, result
526
self.runbzr('resolve hello')
527
result = self.runbzr('conflicts', backtick=1)
528
self.assertEquals(result, "question\n")
529
self.runbzr('commit -m conflicts', retcode=1)
530
self.runbzr('resolve --all')
531
result = self.runbzr('conflicts', backtick=1)
532
self.runbzr('commit -m conflicts')
533
self.assertEquals(result, "")
534
535
def test_resign(self):
536
"""Test re signing of data."""
537
import bzrlib.gpg
538
oldstrategy = bzrlib.gpg.GPGStrategy
539
branch = Branch.initialize('.')
540
branch.commit("base", allow_pointless=True, rev_id='A')
541
try:
542
# monkey patch gpg signing mechanism
543
from bzrlib.testament import Testament
544
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
545
self.runbzr('re-sign -r revid:A')
546
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
547
branch.revision_store.get('A', 'sig').read())
548
finally:
549
bzrlib.gpg.GPGStrategy = oldstrategy
550
551
def listdir_sorted(dir):
552
L = os.listdir(dir)
553
L.sort()
554
return L
180
555
181
556
182
557
class OldTests(ExternalBase):
183
# old tests moved from ./testbzr
184
def runTest(self):
558
"""old tests moved from ./testbzr."""
559
560
def test_bzr(self):
185
561
from os import chdir, mkdir
186
562
from os.path import exists
187
import os
188
563
189
564
runbzr = self.runbzr
190
backtick = self.backtick
565
capture = self.capture
191
566
progress = self.log
192
567
193
568
progress("basic branch creation")
195
570
chdir('branch1')
196
571
runbzr('init')
197
572
198
self.assertEquals(backtick('bzr root').rstrip(),
573
self.assertEquals(capture('root').rstrip(),
199
574
os.path.join(self.test_dir, 'branch1'))
200
575
201
576
progress("status of new file")
204
579
f.write('hello world!\n')
205
580
f.close()
206
581
207
out = backtick("bzr unknowns")
208
self.assertEquals(out, 'test.txt\n')
582
self.assertEquals(capture('unknowns'), 'test.txt\n')
209
583
210
out = backtick("bzr status")
584
out = capture("status")
211
585
assert out == 'unknown:\n test.txt\n'
212
586
213
out = backtick("bzr status --all")
587
out = capture("status --all")
214
588
assert out == "unknown:\n test.txt\n"
215
589
216
out = backtick("bzr status test.txt --all")
590
out = capture("status test.txt --all")
217
591
assert out == "unknown:\n test.txt\n"
218
592
219
593
f = file('test2.txt', 'wt')
220
594
f.write('goodbye cruel world...\n')
221
595
f.close()
222
596
223
out = backtick("bzr status test.txt")
597
out = capture("status test.txt")
224
598
assert out == "unknown:\n test.txt\n"
225
599
226
out = backtick("bzr status")
600
out = capture("status")
227
601
assert out == ("unknown:\n"
228
602
" test.txt\n"
229
603
" test2.txt\n")
231
605
os.unlink('test2.txt')
232
606
233
607
progress("command aliases")
234
out = backtick("bzr st --all")
608
out = capture("st --all")
235
609
assert out == ("unknown:\n"
236
610
" test.txt\n")
237
611
238
out = backtick("bzr stat")
612
out = capture("stat")
239
613
assert out == ("unknown:\n"
240
614
" test.txt\n")
241
615
245
619
runbzr("help commands")
246
620
runbzr("help slartibartfast", 1)
247
621
248
out = backtick("bzr help ci")
622
out = capture("help ci")
249
623
out.index('aliases: ')
250
624
251
625
progress("can't rename unversioned file")
254
628
progress("adding a file")
255
629
256
630
runbzr("add test.txt")
257
assert backtick("bzr unknowns") == ''
258
assert backtick("bzr status --all") == ("added:\n"
631
assert capture("unknowns") == ''
632
assert capture("status --all") == ("added:\n"
259
633
" test.txt\n")
260
634
261
635
progress("rename newly-added file")
263
637
assert os.path.exists("hello.txt")
264
638
assert not os.path.exists("test.txt")
265
639
266
assert backtick("bzr revno") == '0\n'
640
assert capture("revno") == '0\n'
267
641
268
642
progress("add first revision")
269
643
runbzr(['commit', '-m', 'add first revision'])
277
651
runbzr("add sub1")
278
652
runbzr("rename sub1 sub2")
279
653
runbzr("move hello.txt sub2")
280
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
654
self.assertEqual(capture("relpath sub2/hello.txt"),
655
os.path.join("sub2", "hello.txt\n"))
281
656
282
657
assert exists("sub2")
283
658
assert exists("sub2/hello.txt")
298
673
runbzr(['commit', '-m', 'rename nested subdirectories'])
299
674
300
675
chdir('sub1/sub2')
301
self.assertEquals(backtick('bzr root')[:-1],
676
self.assertEquals(capture('root')[:-1],
302
677
os.path.join(self.test_dir, 'branch1'))
303
678
runbzr('move ../hello.txt .')
304
679
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')
680
self.assertEquals(capture('relpath hello.txt'),
681
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
682
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
307
683
runbzr(['commit', '-m', 'move to parent directory'])
308
684
chdir('..')
309
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
685
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
310
686
311
687
runbzr('move sub2/hello.txt .')
312
688
assert exists('hello.txt')
316
692
f.close()
317
693
318
694
f = file('msg.tmp', 'wt')
319
f.write('this is my new commit\n')
695
f.write('this is my new commit\nand it has multiple lines, for fun')
320
696
f.close()
321
697
322
698
runbzr('commit -F msg.tmp')
323
699
324
assert backtick('bzr revno') == '5\n'
700
assert capture('revno') == '5\n'
325
701
runbzr('export -r 5 export-5.tmp')
326
702
runbzr('export export.tmp')
327
703
329
705
runbzr('log -v')
330
706
runbzr('log -v --forward')
331
707
runbzr('log -m', retcode=1)
332
log_out = backtick('bzr log -m commit')
333
assert "this is my new commit" in log_out
708
log_out = capture('log -m commit')
709
assert "this is my new commit\n and" in log_out
334
710
assert "rename nested" not in log_out
335
711
assert 'revision-id' not in log_out
336
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
712
assert 'revision-id' in capture('log --show-ids -m commit')
713
714
log_out = capture('log --line')
715
for line in log_out.splitlines():
716
assert len(line) <= 79, len(line)
717
assert "this is my new commit and" in log_out
337
718
338
719
339
720
progress("file with spaces in name")
349
730
350
731
runbzr('info')
351
732
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')
733
if has_symlinks():
734
progress("symlinks")
735
mkdir('symlinks')
736
chdir('symlinks')
737
runbzr('init')
738
os.symlink("NOWHERE1", "link1")
739
runbzr('add link1')
740
assert self.capture('unknowns') == ''
741
runbzr(['commit', '-m', '1: added symlink link1'])
742
743
mkdir('d1')
744
runbzr('add d1')
745
assert self.capture('unknowns') == ''
746
os.symlink("NOWHERE2", "d1/link2")
747
assert self.capture('unknowns') == 'd1/link2\n'
748
# is d1/link2 found when adding d1
749
runbzr('add d1')
750
assert self.capture('unknowns') == ''
751
os.symlink("NOWHERE3", "d1/link3")
752
assert self.capture('unknowns') == 'd1/link3\n'
753
runbzr(['commit', '-m', '2: added dir, symlink'])
754
755
runbzr('rename d1 d2')
756
runbzr('move d2/link2 .')
757
runbzr('move link1 d2')
758
assert os.readlink("./link2") == "NOWHERE2"
759
assert os.readlink("d2/link1") == "NOWHERE1"
760
runbzr('add d2/link3')
761
runbzr('diff')
762
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
763
764
os.unlink("link2")
765
os.symlink("TARGET 2", "link2")
766
os.unlink("d2/link1")
767
os.symlink("TARGET 1", "d2/link1")
768
runbzr('diff')
769
assert self.capture("relpath d2/link1") == "d2/link1\n"
770
runbzr(['commit', '-m', '4: retarget of two links'])
771
772
runbzr('remove d2/link1')
773
assert self.capture('unknowns') == 'd2/link1\n'
774
runbzr(['commit', '-m', '5: remove d2/link1'])
775
# try with the rm alias
776
runbzr('add d2/link1')
777
runbzr(['commit', '-m', '6: add d2/link1'])
778
runbzr('rm d2/link1')
779
assert self.capture('unknowns') == 'd2/link1\n'
780
runbzr(['commit', '-m', '7: remove d2/link1'])
781
782
os.mkdir("d1")
783
runbzr('add d1')
784
runbzr('rename d2/link3 d1/link3new')
785
assert self.capture('unknowns') == 'd2/link1\n'
786
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
787
788
runbzr(['check'])
789
790
runbzr(['export', '-r', '1', 'exp1.tmp'])
791
chdir("exp1.tmp")
792
assert listdir_sorted(".") == [ "link1" ]
793
assert os.readlink("link1") == "NOWHERE1"
794
chdir("..")
795
796
runbzr(['export', '-r', '2', 'exp2.tmp'])
797
chdir("exp2.tmp")
798
assert listdir_sorted(".") == [ "d1", "link1" ]
799
chdir("..")
800
801
runbzr(['export', '-r', '3', 'exp3.tmp'])
802
chdir("exp3.tmp")
803
assert listdir_sorted(".") == [ "d2", "link2" ]
804
assert listdir_sorted("d2") == [ "link1", "link3" ]
805
assert os.readlink("d2/link1") == "NOWHERE1"
806
assert os.readlink("link2") == "NOWHERE2"
807
chdir("..")
808
809
runbzr(['export', '-r', '4', 'exp4.tmp'])
810
chdir("exp4.tmp")
811
assert listdir_sorted(".") == [ "d2", "link2" ]
812
assert os.readlink("d2/link1") == "TARGET 1"
813
assert os.readlink("link2") == "TARGET 2"
814
assert listdir_sorted("d2") == [ "link1", "link3" ]
815
chdir("..")
816
817
runbzr(['export', '-r', '5', 'exp5.tmp'])
818
chdir("exp5.tmp")
819
assert listdir_sorted(".") == [ "d2", "link2" ]
820
assert os.path.islink("link2")
821
assert listdir_sorted("d2")== [ "link3" ]
822
chdir("..")
823
824
runbzr(['export', '-r', '8', 'exp6.tmp'])
825
chdir("exp6.tmp")
826
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
827
assert listdir_sorted("d1") == [ "link3new" ]
828
assert listdir_sorted("d2") == []
829
assert os.readlink("d1/link3new") == "NOWHERE3"
830
chdir("..")
831
else:
832
progress("skipping symlink tests")
833
834
835
class HttpTests(TestCaseWithWebserver):
836
"""Test bzr ui commands against remote branches."""
837
838
def test_branch(self):
839
os.mkdir('from')
840
branch = Branch.initialize('from')
841
branch.commit('empty commit for nonsense', allow_pointless=True)
842
url = self.get_remote_url('from')
843
self.run_bzr('branch', url, 'to')
844
branch = Branch.open('to')
845
self.assertEqual(1, len(branch.revision_history()))
846
847
def test_log(self):
848
self.build_tree(['branch/', 'branch/file'])
849
branch = Branch.initialize('branch')
850
branch.add(['file'])
851
branch.commit('add file', rev_id='A')
852
url = self.get_remote_url('branch/file')
853
output = self.capture('log %s' % url)
854
self.assertEqual(7, len(output.split('\n')))
364
855
365
file('hello', 'wt').write('bar')
366
self.runbzr('revert hello')
367
self.check_file_contents('hello', 'foo')
856
857
368
858
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0