« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 1185.16.64
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.16.64
- Committer: Martin Pool
- Date: 2005-10-17 09:39:46 UTC
- mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1464.
- Revision ID: mbp@sourcefrog.net-20051017093946-d28e99e7305deaf7
- more error conversions
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- contrib/emacs
- 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 *
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
29
# this code was previously in testbzr
30
31
from unittest import TestCase
32
from bzrlib.selftest import TestBase, InTempDir
33
34
35
36
class ExternalBase(InTempDir):
37
def runbzr(self, args, retcode=0):
38
try:
39
import shutil
40
from subprocess import call
41
except ImportError, e:
42
_need_subprocess()
43
raise
44
26
27
from cStringIO import StringIO
28
import os
29
import re
30
import shutil
31
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):
45
44
if isinstance(args, basestring):
46
45
args = args.split()
47
48
return self.runcmd(['python', self.BZRPATH,] + args,
49
retcode=retcode)
50
51
52
53
class TestVersion(ExternalBase):
54
def runTest(self):
55
# output is intentionally passed through to stdout so that we
56
# can see the version being tested
57
self.runbzr(['version'])
58
59
60
61
class HelpCommands(ExternalBase):
62
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):
63
56
self.runbzr('--help')
64
57
self.runbzr('help')
65
58
self.runbzr('help commands')
66
59
self.runbzr('help help')
67
60
self.runbzr('commit -h')
68
61
69
70
class InitBranch(ExternalBase):
71
def runTest(self):
72
import os
62
def test_init_branch(self):
73
63
self.runbzr(['init'])
74
64
75
76
77
class UserIdentity(ExternalBase):
78
def runTest(self):
65
def test_whoami(self):
79
66
# this should always identify something, if only "john@localhost"
80
67
self.runbzr("whoami")
81
68
self.runbzr("whoami --email")
82
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
83
1)
84
85
86
class InvalidCommands(ExternalBase):
87
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):
88
97
self.runbzr("pants", retcode=1)
89
98
self.runbzr("--pants off", retcode=1)
90
99
self.runbzr("diff --message foo", retcode=1)
91
100
92
93
94
class EmptyCommit(ExternalBase):
95
def runTest(self):
101
def test_empty_commit(self):
96
102
self.runbzr("init")
97
103
self.build_tree(['hello.txt'])
98
104
self.runbzr("commit -m empty", retcode=1)
99
105
self.runbzr("add hello.txt")
100
106
self.runbzr("commit -m added")
101
107
102
103
104
class IgnorePatterns(ExternalBase):
105
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):
106
115
from bzrlib.branch import Branch
107
116
108
b = Branch('.', init=True)
117
b = Branch.initialize('.')
109
118
self.assertEquals(list(b.unknowns()), [])
110
119
111
120
file('foo.tmp', 'wt').write('tmp files are ignored')
112
121
self.assertEquals(list(b.unknowns()), [])
113
assert self.backtick('bzr unknowns') == ''
122
assert self.capture('unknowns') == ''
114
123
115
124
file('foo.c', 'wt').write('int main() {}')
116
125
self.assertEquals(list(b.unknowns()), ['foo.c'])
117
assert self.backtick('bzr unknowns') == 'foo.c\n'
126
assert self.capture('unknowns') == 'foo.c\n'
118
127
119
128
self.runbzr(['add', 'foo.c'])
120
assert self.backtick('bzr unknowns') == ''
129
assert self.capture('unknowns') == ''
121
130
122
131
# 'ignore' works when creating the .bzignore file
123
132
file('foo.blah', 'wt').write('blah')
124
133
self.assertEquals(list(b.unknowns()), ['foo.blah'])
125
134
self.runbzr('ignore *.blah')
126
135
self.assertEquals(list(b.unknowns()), [])
127
assert file('.bzrignore', 'rb').read() == '*.blah\n'
136
assert file('.bzrignore', 'rU').read() == '*.blah\n'
128
137
129
138
# 'ignore' works when then .bzrignore file already exists
130
139
file('garh', 'wt').write('garh')
131
140
self.assertEquals(list(b.unknowns()), ['garh'])
132
assert self.backtick('bzr unknowns') == 'garh\n'
141
assert self.capture('unknowns') == 'garh\n'
133
142
self.runbzr('ignore garh')
134
143
self.assertEquals(list(b.unknowns()), [])
135
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
136
137
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
self.runbzr('pull ../a', retcode=1)
404
os.chdir('../a')
405
self.runbzr('merge ../b')
406
self.runbzr('commit -m blah4 --unchanged')
407
os.chdir('../b/subdir')
408
self.runbzr('pull ../../a')
409
assert a.revision_history()[-1] == b.revision_history()[-1]
410
self.runbzr('commit -m blah5 --unchanged')
411
self.runbzr('commit -m blah6 --unchanged')
412
os.chdir('..')
413
self.runbzr('pull ../a')
414
os.chdir('../a')
415
self.runbzr('commit -m blah7 --unchanged')
416
self.runbzr('merge ../b')
417
self.runbzr('commit -m blah8 --unchanged')
418
self.runbzr('pull ../b')
419
self.runbzr('pull ../b')
420
421
def test_locations(self):
422
"""Using and remembering different locations"""
423
os.mkdir('a')
424
os.chdir('a')
425
self.runbzr('init')
426
self.runbzr('commit -m unchanged --unchanged')
427
self.runbzr('pull', retcode=1)
428
self.runbzr('merge', retcode=1)
429
self.runbzr('branch . ../b')
430
os.chdir('../b')
431
self.runbzr('pull')
432
self.runbzr('branch . ../c')
433
self.runbzr('pull ../c')
434
self.runbzr('merge')
435
os.chdir('../a')
436
self.runbzr('pull ../b')
437
self.runbzr('pull')
438
self.runbzr('pull ../c')
439
self.runbzr('branch ../c ../d')
440
shutil.rmtree('../c')
441
self.runbzr('pull')
442
os.chdir('../b')
443
self.runbzr('pull')
444
os.chdir('../d')
445
self.runbzr('pull', retcode=1)
446
self.runbzr('pull ../a --remember')
447
self.runbzr('pull')
448
449
def test_add_reports(self):
450
"""add command prints the names of added files."""
451
b = Branch.initialize('.')
452
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
453
out = self.run_bzr_captured(['add'], retcode = 0)[0]
454
# the ordering is not defined at the moment
455
results = sorted(out.rstrip('\n').split('\n'))
456
self.assertEquals(['added dir',
457
'added dir'+os.sep+'sub.txt',
458
'added top.txt',],
459
results)
460
461
def test_add_quiet_is(self):
462
"""add -q does not print the names of added files."""
463
b = Branch.initialize('.')
464
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
465
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
466
# the ordering is not defined at the moment
467
results = sorted(out.rstrip('\n').split('\n'))
468
self.assertEquals([''], results)
469
470
def test_unknown_command(self):
471
"""Handling of unknown command."""
472
out, err = self.run_bzr_captured(['fluffy-badger'],
473
retcode=1)
474
self.assertEquals(out, '')
475
err.index('unknown command')
476
477
def test_conflicts(self):
478
"""Handling of merge conflicts"""
479
os.mkdir('base')
480
os.chdir('base')
481
file('hello', 'wb').write("hi world")
482
file('answer', 'wb').write("42")
483
self.runbzr('init')
484
self.runbzr('add')
485
self.runbzr('commit -m base')
486
self.runbzr('branch . ../other')
487
self.runbzr('branch . ../this')
488
os.chdir('../other')
489
file('hello', 'wb').write("Hello.")
490
file('answer', 'wb').write("Is anyone there?")
491
self.runbzr('commit -m other')
492
os.chdir('../this')
493
file('hello', 'wb').write("Hello, world")
494
self.runbzr('mv answer question')
495
file('question', 'wb').write("What do you get when you multiply six"
496
"times nine?")
497
self.runbzr('commit -m this')
498
self.runbzr('merge ../other')
499
result = self.runbzr('conflicts', backtick=1)
500
self.assertEquals(result, "hello\nquestion\n")
501
result = self.runbzr('status', backtick=1)
502
assert "conflicts:\n hello\n question\n" in result, result
503
self.runbzr('resolve hello')
504
result = self.runbzr('conflicts', backtick=1)
505
self.assertEquals(result, "question\n")
506
self.runbzr('commit -m conflicts', retcode=1)
507
self.runbzr('resolve --all')
508
result = self.runbzr('conflicts', backtick=1)
509
self.runbzr('commit -m conflicts')
510
self.assertEquals(result, "")
511
512
def listdir_sorted(dir):
513
L = os.listdir(dir)
514
L.sort()
515
return L
138
516
139
517
140
518
class OldTests(ExternalBase):
141
# old tests moved from ./testbzr
142
def runTest(self):
519
"""old tests moved from ./testbzr."""
520
521
def test_bzr(self):
143
522
from os import chdir, mkdir
144
523
from os.path import exists
145
import os
146
524
147
525
runbzr = self.runbzr
148
backtick = self.backtick
526
capture = self.capture
149
527
progress = self.log
150
528
151
529
progress("basic branch creation")
153
531
chdir('branch1')
154
532
runbzr('init')
155
533
156
self.assertEquals(backtick('bzr root').rstrip(),
534
self.assertEquals(capture('root').rstrip(),
157
535
os.path.join(self.test_dir, 'branch1'))
158
536
159
537
progress("status of new file")
162
540
f.write('hello world!\n')
163
541
f.close()
164
542
165
out = backtick("bzr unknowns")
166
self.assertEquals(out, 'test.txt\n')
543
self.assertEquals(capture('unknowns'), 'test.txt\n')
167
544
168
out = backtick("bzr status")
545
out = capture("status")
169
546
assert out == 'unknown:\n test.txt\n'
170
547
171
out = backtick("bzr status --all")
548
out = capture("status --all")
172
549
assert out == "unknown:\n test.txt\n"
173
550
174
out = backtick("bzr status test.txt --all")
551
out = capture("status test.txt --all")
175
552
assert out == "unknown:\n test.txt\n"
176
553
177
554
f = file('test2.txt', 'wt')
178
555
f.write('goodbye cruel world...\n')
179
556
f.close()
180
557
181
out = backtick("bzr status test.txt")
558
out = capture("status test.txt")
182
559
assert out == "unknown:\n test.txt\n"
183
560
184
out = backtick("bzr status")
561
out = capture("status")
185
562
assert out == ("unknown:\n"
186
563
" test.txt\n"
187
564
" test2.txt\n")
189
566
os.unlink('test2.txt')
190
567
191
568
progress("command aliases")
192
out = backtick("bzr st --all")
569
out = capture("st --all")
193
570
assert out == ("unknown:\n"
194
571
" test.txt\n")
195
572
196
out = backtick("bzr stat")
573
out = capture("stat")
197
574
assert out == ("unknown:\n"
198
575
" test.txt\n")
199
576
203
580
runbzr("help commands")
204
581
runbzr("help slartibartfast", 1)
205
582
206
out = backtick("bzr help ci")
583
out = capture("help ci")
207
584
out.index('aliases: ')
208
585
209
586
progress("can't rename unversioned file")
212
589
progress("adding a file")
213
590
214
591
runbzr("add test.txt")
215
assert backtick("bzr unknowns") == ''
216
assert backtick("bzr status --all") == ("added:\n"
592
assert capture("unknowns") == ''
593
assert capture("status --all") == ("added:\n"
217
594
" test.txt\n")
218
595
219
596
progress("rename newly-added file")
221
598
assert os.path.exists("hello.txt")
222
599
assert not os.path.exists("test.txt")
223
600
224
assert backtick("bzr revno") == '0\n'
601
assert capture("revno") == '0\n'
225
602
226
603
progress("add first revision")
227
604
runbzr(['commit', '-m', 'add first revision'])
235
612
runbzr("add sub1")
236
613
runbzr("rename sub1 sub2")
237
614
runbzr("move hello.txt sub2")
238
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
615
self.assertEqual(capture("relpath sub2/hello.txt"),
616
os.path.join("sub2", "hello.txt\n"))
239
617
240
618
assert exists("sub2")
241
619
assert exists("sub2/hello.txt")
256
634
runbzr(['commit', '-m', 'rename nested subdirectories'])
257
635
258
636
chdir('sub1/sub2')
259
self.assertEquals(backtick('bzr root')[:-1],
637
self.assertEquals(capture('root')[:-1],
260
638
os.path.join(self.test_dir, 'branch1'))
261
639
runbzr('move ../hello.txt .')
262
640
assert exists('./hello.txt')
263
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
264
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
641
self.assertEquals(capture('relpath hello.txt'),
642
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
643
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
265
644
runbzr(['commit', '-m', 'move to parent directory'])
266
645
chdir('..')
267
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
646
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
268
647
269
648
runbzr('move sub2/hello.txt .')
270
649
assert exists('hello.txt')
274
653
f.close()
275
654
276
655
f = file('msg.tmp', 'wt')
277
f.write('this is my new commit\n')
656
f.write('this is my new commit\nand it has multiple lines, for fun')
278
657
f.close()
279
658
280
659
runbzr('commit -F msg.tmp')
281
660
282
assert backtick('bzr revno') == '5\n'
661
assert capture('revno') == '5\n'
283
662
runbzr('export -r 5 export-5.tmp')
284
663
runbzr('export export.tmp')
285
664
286
665
runbzr('log')
287
666
runbzr('log -v')
667
runbzr('log -v --forward')
668
runbzr('log -m', retcode=1)
669
log_out = capture('log -m commit')
670
assert "this is my new commit\n and" in log_out
671
assert "rename nested" not in log_out
672
assert 'revision-id' not in log_out
673
assert 'revision-id' in capture('log --show-ids -m commit')
288
674
675
log_out = capture('log --line')
676
for line in log_out.splitlines():
677
assert len(line) <= 79, len(line)
678
assert "this is my new commit and" in log_out
289
679
290
680
291
681
progress("file with spaces in name")
301
691
302
692
runbzr('info')
303
693
304
305
306
307
308
309
chdir('..')
310
chdir('..')
311
progress('branch')
312
assert os.path.exists('branch1')
313
assert not os.path.exists('branch2')
314
# Can't create a branch if it already exists
315
runbzr('branch branch1', retcode=1)
316
# Can't create a branch if its parent doesn't exist
317
runbzr('branch /unlikely/to/exist', retcode=1)
318
runbzr('branch branch1 branch2')
319
320
progress("pull")
321
chdir('branch1')
322
runbzr('pull', retcode=1)
323
runbzr('pull ../branch2')
324
chdir('.bzr')
325
runbzr('pull')
326
runbzr('commit --unchanged -m empty')
327
runbzr('pull')
328
chdir('../../branch2')
329
runbzr('pull')
330
runbzr('commit --unchanged -m empty')
331
chdir('../branch1')
332
runbzr('commit --unchanged -m empty')
333
runbzr('pull', retcode=1)
334
chdir ('..')
335
336
progress('status after remove')
337
mkdir('status-after-remove')
338
# see mail from William Dodé, 2005-05-25
339
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
340
# * looking for changes...
341
# added a
342
# * commited r1
343
# $ bzr remove a
344
# $ bzr status
345
# bzr: local variable 'kind' referenced before assignment
346
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
347
# see ~/.bzr.log for debug information
348
chdir('status-after-remove')
349
runbzr('init')
350
file('a', 'w').write('foo')
351
runbzr('add a')
352
runbzr(['commit', '-m', 'add a'])
353
runbzr('remove a')
354
runbzr('status')
355
356
chdir('..')
357
358
359
360
progress("recursive and non-recursive add")
361
mkdir('no-recurse')
362
chdir('no-recurse')
363
runbzr('init')
364
mkdir('foo')
365
fp = os.path.join('foo', 'test.txt')
366
f = file(fp, 'w')
367
f.write('hello!\n')
368
f.close()
369
runbzr('add --no-recurse foo')
370
runbzr('file-id foo')
371
runbzr('file-id ' + fp, 1) # not versioned yet
372
runbzr('commit -m add-dir-only')
373
374
self.runbzr('file-id ' + fp, 1) # still not versioned
375
376
self.runbzr('add foo')
377
self.runbzr('file-id ' + fp)
378
self.runbzr('commit -m add-sub-file')
379
380
chdir('..')
381
382
383
384
class RevertCommand(ExternalBase):
385
def runTest(self):
386
self.runbzr('init')
387
388
file('hello', 'wt').write('foo')
389
self.runbzr('add hello')
390
self.runbzr('commit -m setup hello')
391
392
file('hello', 'wt').write('bar')
393
self.runbzr('revert hello')
394
self.check_file_contents('hello', 'foo')
694
if has_symlinks():
695
progress("symlinks")
696
mkdir('symlinks')
697
chdir('symlinks')
698
runbzr('init')
699
os.symlink("NOWHERE1", "link1")
700
runbzr('add link1')
701
assert self.capture('unknowns') == ''
702
runbzr(['commit', '-m', '1: added symlink link1'])
703
704
mkdir('d1')
705
runbzr('add d1')
706
assert self.capture('unknowns') == ''
707
os.symlink("NOWHERE2", "d1/link2")
708
assert self.capture('unknowns') == 'd1/link2\n'
709
# is d1/link2 found when adding d1
710
runbzr('add d1')
711
assert self.capture('unknowns') == ''
712
os.symlink("NOWHERE3", "d1/link3")
713
assert self.capture('unknowns') == 'd1/link3\n'
714
runbzr(['commit', '-m', '2: added dir, symlink'])
715
716
runbzr('rename d1 d2')
717
runbzr('move d2/link2 .')
718
runbzr('move link1 d2')
719
assert os.readlink("./link2") == "NOWHERE2"
720
assert os.readlink("d2/link1") == "NOWHERE1"
721
runbzr('add d2/link3')
722
runbzr('diff')
723
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
724
725
os.unlink("link2")
726
os.symlink("TARGET 2", "link2")
727
os.unlink("d2/link1")
728
os.symlink("TARGET 1", "d2/link1")
729
runbzr('diff')
730
assert self.capture("relpath d2/link1") == "d2/link1\n"
731
runbzr(['commit', '-m', '4: retarget of two links'])
732
733
runbzr('remove d2/link1')
734
assert self.capture('unknowns') == 'd2/link1\n'
735
runbzr(['commit', '-m', '5: remove d2/link1'])
736
# try with the rm alias
737
runbzr('add d2/link1')
738
runbzr(['commit', '-m', '6: add d2/link1'])
739
runbzr('rm d2/link1')
740
assert self.capture('unknowns') == 'd2/link1\n'
741
runbzr(['commit', '-m', '7: remove d2/link1'])
742
743
os.mkdir("d1")
744
runbzr('add d1')
745
runbzr('rename d2/link3 d1/link3new')
746
assert self.capture('unknowns') == 'd2/link1\n'
747
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
748
749
runbzr(['check'])
750
751
runbzr(['export', '-r', '1', 'exp1.tmp'])
752
chdir("exp1.tmp")
753
assert listdir_sorted(".") == [ "link1" ]
754
assert os.readlink("link1") == "NOWHERE1"
755
chdir("..")
756
757
runbzr(['export', '-r', '2', 'exp2.tmp'])
758
chdir("exp2.tmp")
759
assert listdir_sorted(".") == [ "d1", "link1" ]
760
chdir("..")
761
762
runbzr(['export', '-r', '3', 'exp3.tmp'])
763
chdir("exp3.tmp")
764
assert listdir_sorted(".") == [ "d2", "link2" ]
765
assert listdir_sorted("d2") == [ "link1", "link3" ]
766
assert os.readlink("d2/link1") == "NOWHERE1"
767
assert os.readlink("link2") == "NOWHERE2"
768
chdir("..")
769
770
runbzr(['export', '-r', '4', 'exp4.tmp'])
771
chdir("exp4.tmp")
772
assert listdir_sorted(".") == [ "d2", "link2" ]
773
assert os.readlink("d2/link1") == "TARGET 1"
774
assert os.readlink("link2") == "TARGET 2"
775
assert listdir_sorted("d2") == [ "link1", "link3" ]
776
chdir("..")
777
778
runbzr(['export', '-r', '5', 'exp5.tmp'])
779
chdir("exp5.tmp")
780
assert listdir_sorted(".") == [ "d2", "link2" ]
781
assert os.path.islink("link2")
782
assert listdir_sorted("d2")== [ "link3" ]
783
chdir("..")
784
785
runbzr(['export', '-r', '8', 'exp6.tmp'])
786
chdir("exp6.tmp")
787
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
788
assert listdir_sorted("d1") == [ "link3new" ]
789
assert listdir_sorted("d2") == []
790
assert os.readlink("d1/link3new") == "NOWHERE3"
791
chdir("..")
792
else:
793
progress("skipping symlink tests")
794
795
796
class HttpTests(TestCaseWithWebserver):
797
"""Test bzr ui commands against remote branches."""
798
799
def test_branch(self):
800
os.mkdir('from')
801
branch = Branch.initialize('from')
802
branch.commit('empty commit for nonsense', allow_pointless=True)
803
url = self.get_remote_url('from')
804
self.run_bzr('branch', url, 'to')
805
branch = Branch.open('to')
806
self.assertEqual(1, len(branch.revision_history()))
807
395
808
Loggerhead is a web-based interface for Breezy
Version: 2.0.1