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 1472
- compare with another revision
- download diff
- download tarball
- view history from revision 1472
- Committer: Robert Collins
- Date: 2005-10-20 02:52:44 UTC
- Revision ID: robertc@robertcollins.net-20051020025244-fa1017d19a0ef618
post commit hook, first pass implementation
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- 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')
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
180
540
181
541
182
542
class OldTests(ExternalBase):
183
# old tests moved from ./testbzr
184
def runTest(self):
543
"""old tests moved from ./testbzr."""
544
545
def test_bzr(self):
185
546
from os import chdir, mkdir
186
547
from os.path import exists
187
import os
188
548
189
549
runbzr = self.runbzr
190
backtick = self.backtick
550
capture = self.capture
191
551
progress = self.log
192
552
193
553
progress("basic branch creation")
195
555
chdir('branch1')
196
556
runbzr('init')
197
557
198
self.assertEquals(backtick('bzr root').rstrip(),
558
self.assertEquals(capture('root').rstrip(),
199
559
os.path.join(self.test_dir, 'branch1'))
200
560
201
561
progress("status of new file")
204
564
f.write('hello world!\n')
205
565
f.close()
206
566
207
out = backtick("bzr unknowns")
208
self.assertEquals(out, 'test.txt\n')
567
self.assertEquals(capture('unknowns'), 'test.txt\n')
209
568
210
out = backtick("bzr status")
569
out = capture("status")
211
570
assert out == 'unknown:\n test.txt\n'
212
571
213
out = backtick("bzr status --all")
572
out = capture("status --all")
214
573
assert out == "unknown:\n test.txt\n"
215
574
216
out = backtick("bzr status test.txt --all")
575
out = capture("status test.txt --all")
217
576
assert out == "unknown:\n test.txt\n"
218
577
219
578
f = file('test2.txt', 'wt')
220
579
f.write('goodbye cruel world...\n')
221
580
f.close()
222
581
223
out = backtick("bzr status test.txt")
582
out = capture("status test.txt")
224
583
assert out == "unknown:\n test.txt\n"
225
584
226
out = backtick("bzr status")
585
out = capture("status")
227
586
assert out == ("unknown:\n"
228
587
" test.txt\n"
229
588
" test2.txt\n")
231
590
os.unlink('test2.txt')
232
591
233
592
progress("command aliases")
234
out = backtick("bzr st --all")
593
out = capture("st --all")
235
594
assert out == ("unknown:\n"
236
595
" test.txt\n")
237
596
238
out = backtick("bzr stat")
597
out = capture("stat")
239
598
assert out == ("unknown:\n"
240
599
" test.txt\n")
241
600
245
604
runbzr("help commands")
246
605
runbzr("help slartibartfast", 1)
247
606
248
out = backtick("bzr help ci")
607
out = capture("help ci")
249
608
out.index('aliases: ')
250
609
251
610
progress("can't rename unversioned file")
254
613
progress("adding a file")
255
614
256
615
runbzr("add test.txt")
257
assert backtick("bzr unknowns") == ''
258
assert backtick("bzr status --all") == ("added:\n"
616
assert capture("unknowns") == ''
617
assert capture("status --all") == ("added:\n"
259
618
" test.txt\n")
260
619
261
620
progress("rename newly-added file")
263
622
assert os.path.exists("hello.txt")
264
623
assert not os.path.exists("test.txt")
265
624
266
assert backtick("bzr revno") == '0\n'
625
assert capture("revno") == '0\n'
267
626
268
627
progress("add first revision")
269
628
runbzr(['commit', '-m', 'add first revision'])
277
636
runbzr("add sub1")
278
637
runbzr("rename sub1 sub2")
279
638
runbzr("move hello.txt sub2")
280
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
639
self.assertEqual(capture("relpath sub2/hello.txt"),
640
os.path.join("sub2", "hello.txt\n"))
281
641
282
642
assert exists("sub2")
283
643
assert exists("sub2/hello.txt")
298
658
runbzr(['commit', '-m', 'rename nested subdirectories'])
299
659
300
660
chdir('sub1/sub2')
301
self.assertEquals(backtick('bzr root')[:-1],
661
self.assertEquals(capture('root')[:-1],
302
662
os.path.join(self.test_dir, 'branch1'))
303
663
runbzr('move ../hello.txt .')
304
664
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')
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')
307
668
runbzr(['commit', '-m', 'move to parent directory'])
308
669
chdir('..')
309
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
670
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
310
671
311
672
runbzr('move sub2/hello.txt .')
312
673
assert exists('hello.txt')
316
677
f.close()
317
678
318
679
f = file('msg.tmp', 'wt')
319
f.write('this is my new commit\n')
680
f.write('this is my new commit\nand it has multiple lines, for fun')
320
681
f.close()
321
682
322
683
runbzr('commit -F msg.tmp')
323
684
324
assert backtick('bzr revno') == '5\n'
685
assert capture('revno') == '5\n'
325
686
runbzr('export -r 5 export-5.tmp')
326
687
runbzr('export export.tmp')
327
688
329
690
runbzr('log -v')
330
691
runbzr('log -v --forward')
331
692
runbzr('log -m', retcode=1)
332
log_out = backtick('bzr log -m commit')
333
assert "this is my new commit" in log_out
693
log_out = capture('log -m commit')
694
assert "this is my new commit\n and" in log_out
334
695
assert "rename nested" not in log_out
335
696
assert 'revision-id' not in log_out
336
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
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
703
338
704
339
705
progress("file with spaces in name")
349
715
350
716
runbzr('info')
351
717
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')
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')))
364
840
365
file('hello', 'wt').write('bar')
366
self.runbzr('revert hello')
367
self.check_file_contents('hello', 'foo')
841
842
368
843
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0