« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 885
- compare with another revision
- download diff
- download tarball
- view history from revision 885
- Committer: Martin Pool
- Date: 2005-07-11 03:40:02 UTC
- Revision ID: mbp@sourcefrog.net-20050711034002-575d84b4c7514542
- commit command refuses unless something is changed or --unchanged is given
- files added:
- bzrlib/meta_store.py
- plugins/changeset
- files removed:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- contrib/emacs
- files renamed:
- contrib/newinventory.py => bzrlib/newinventory.py
- bzrlib/store/__init__.py => bzrlib/store.py
- bzrlib/util/effbot/ => effbot/
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/plugins/ => plugins/
- bzrlib/selftest/test_weave.py => tools/testweave.py
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/selftest/blackbox.py
19
19
"""Black-box tests for bzr.
20
20
21
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface. This doesn't actually run a new interpreter but
23
rather starts again from the run_bzr function.
22
command-line interface.
23
24
This always reinvokes bzr through a new Python interpreter, which is a
25
bit inefficient but arguably tests in a way more representative of how
26
it's normally invoked.
24
27
"""
25
28
26
27
from cStringIO import StringIO
28
import os
29
import shutil
30
import sys
31
import os
32
33
from bzrlib.branch import Branch
34
from bzrlib.errors import BzrCommandError
35
from bzrlib.osutils import has_symlinks
36
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
37
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
38
39
40
class ExternalBase(TestCaseInTempDir):
41
42
def runbzr(self, args, retcode=0, backtick=False):
43
if isinstance(args, basestring):
44
args = args.split()
45
46
if backtick:
47
return self.run_bzr_captured(args, retcode=retcode)[0]
48
else:
49
return self.run_bzr_captured(args, retcode=retcode)
50
51
52
class TestCommands(ExternalBase):
53
54
def test_help_commands(self):
55
self.runbzr('--help')
56
self.runbzr('help')
57
self.runbzr('help commands')
58
self.runbzr('help help')
59
self.runbzr('commit -h')
60
61
def test_init_branch(self):
62
self.runbzr(['init'])
63
64
def test_whoami(self):
29
# this code was previously in testbzr
30
31
from unittest import TestCase
32
from bzrlib.selftest import TestBase, InTempDir
33
34
class TestVersion(TestBase):
35
def runTest(self):
36
# output is intentionally passed through to stdout so that we
37
# can see the version being tested
38
self.runcmd(['bzr', 'version'])
39
40
41
42
class HelpCommands(TestBase):
43
def runTest(self):
44
self.runcmd('bzr --help')
45
self.runcmd('bzr help')
46
self.runcmd('bzr help commands')
47
self.runcmd('bzr help help')
48
self.runcmd('bzr commit -h')
49
50
51
class InitBranch(InTempDir):
52
def runTest(self):
53
import os
54
self.runcmd(['bzr', 'init'])
55
56
57
58
class UserIdentity(InTempDir):
59
def runTest(self):
65
60
# this should always identify something, if only "john@localhost"
66
self.runbzr("whoami")
67
self.runbzr("whoami --email")
68
69
self.assertEquals(self.runbzr("whoami --email",
70
backtick=True).count('@'), 1)
71
72
def test_whoami_branch(self):
73
"""branch specific user identity works."""
74
self.runbzr('init')
75
f = file('.bzr/email', 'wt')
76
f.write('Branch Identity <branch@identi.ty>')
77
f.close()
78
bzr_email = os.environ.get('BZREMAIL')
79
if bzr_email is not None:
80
del os.environ['BZREMAIL']
81
whoami = self.runbzr("whoami",backtick=True)
82
whoami_email = self.runbzr("whoami --email",backtick=True)
83
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
84
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
85
# Verify that the environment variable overrides the value
86
# in the file
87
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
88
whoami = self.runbzr("whoami",backtick=True)
89
whoami_email = self.runbzr("whoami --email",backtick=True)
90
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
91
self.assertTrue(whoami_email.startswith('other@environ.ment'))
92
if bzr_email is not None:
93
os.environ['BZREMAIL'] = bzr_email
94
95
def test_invalid_commands(self):
96
self.runbzr("pants", retcode=1)
97
self.runbzr("--pants off", retcode=1)
98
self.runbzr("diff --message foo", retcode=1)
99
100
def test_empty_commit(self):
101
self.runbzr("init")
61
self.runcmd("bzr whoami")
62
self.runcmd("bzr whoami --email")
63
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
64
1)
65
66
67
class InvalidCommands(InTempDir):
68
def runTest(self):
69
self.runcmd("bzr pants", retcode=1)
70
self.runcmd("bzr --pants off", retcode=1)
71
self.runcmd("bzr diff --message foo", retcode=1)
72
73
74
75
class EmptyCommit(InTempDir):
76
def runTest(self):
77
self.runcmd("bzr init")
102
78
self.build_tree(['hello.txt'])
103
self.runbzr("commit -m empty", retcode=1)
104
self.runbzr("add hello.txt")
105
self.runbzr("commit -m added")
106
107
def test_empty_commit_message(self):
108
self.runbzr("init")
109
file('foo.c', 'wt').write('int main() {}')
110
self.runbzr(['add', 'foo.c'])
111
self.runbzr(["commit", "-m", ""] , retcode=1)
112
113
def test_ignore_patterns(self):
114
from bzrlib.branch import Branch
115
116
b = Branch.initialize('.')
117
self.assertEquals(list(b.unknowns()), [])
118
119
file('foo.tmp', 'wt').write('tmp files are ignored')
120
self.assertEquals(list(b.unknowns()), [])
121
assert self.capture('unknowns') == ''
122
123
file('foo.c', 'wt').write('int main() {}')
124
self.assertEquals(list(b.unknowns()), ['foo.c'])
125
assert self.capture('unknowns') == 'foo.c\n'
126
127
self.runbzr(['add', 'foo.c'])
128
assert self.capture('unknowns') == ''
129
130
# 'ignore' works when creating the .bzignore file
131
file('foo.blah', 'wt').write('blah')
132
self.assertEquals(list(b.unknowns()), ['foo.blah'])
133
self.runbzr('ignore *.blah')
134
self.assertEquals(list(b.unknowns()), [])
135
assert file('.bzrignore', 'rU').read() == '*.blah\n'
136
137
# 'ignore' works when then .bzrignore file already exists
138
file('garh', 'wt').write('garh')
139
self.assertEquals(list(b.unknowns()), ['garh'])
140
assert self.capture('unknowns') == 'garh\n'
141
self.runbzr('ignore garh')
142
self.assertEquals(list(b.unknowns()), [])
143
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
144
145
def test_revert(self):
146
self.runbzr('init')
147
148
file('hello', 'wt').write('foo')
149
self.runbzr('add hello')
150
self.runbzr('commit -m setup hello')
151
152
file('goodbye', 'wt').write('baz')
153
self.runbzr('add goodbye')
154
self.runbzr('commit -m setup goodbye')
155
156
file('hello', 'wt').write('bar')
157
file('goodbye', 'wt').write('qux')
158
self.runbzr('revert hello')
159
self.check_file_contents('hello', 'foo')
160
self.check_file_contents('goodbye', 'qux')
161
self.runbzr('revert')
162
self.check_file_contents('goodbye', 'baz')
163
164
os.mkdir('revertdir')
165
self.runbzr('add revertdir')
166
self.runbzr('commit -m f')
167
os.rmdir('revertdir')
168
self.runbzr('revert')
169
170
os.symlink('/unlikely/to/exist', 'symlink')
171
self.runbzr('add symlink')
172
self.runbzr('commit -m f')
173
os.unlink('symlink')
174
self.runbzr('revert')
175
176
file('hello', 'wt').write('xyz')
177
self.runbzr('commit -m xyz hello')
178
self.runbzr('revert -r 1 hello')
179
self.check_file_contents('hello', 'foo')
180
self.runbzr('revert hello')
181
self.check_file_contents('hello', 'xyz')
182
os.chdir('revertdir')
183
self.runbzr('revert')
184
os.chdir('..')
185
186
187
def test_mv_modes(self):
188
"""Test two modes of operation for mv"""
189
from bzrlib.branch import Branch
190
b = Branch.initialize('.')
191
self.build_tree(['a', 'c', 'subdir/'])
192
self.run_bzr_captured(['add', self.test_dir])
193
self.run_bzr_captured(['mv', 'a', 'b'])
194
self.run_bzr_captured(['mv', 'b', 'subdir'])
195
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
196
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
197
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
198
199
def test_main_version(self):
200
"""Check output from version command and master option is reasonable"""
201
# output is intentionally passed through to stdout so that we
202
# can see the version being tested
203
output = self.runbzr('version', backtick=1)
204
self.log('bzr version output:')
205
self.log(output)
206
self.assert_(output.startswith('bzr (bazaar-ng) '))
207
self.assertNotEqual(output.index('Canonical'), -1)
208
# make sure --version is consistent
209
tmp_output = self.runbzr('--version', backtick=1)
210
self.log('bzr --version output:')
211
self.log(tmp_output)
212
self.assertEquals(output, tmp_output)
213
214
def example_branch(test):
215
test.runbzr('init')
216
file('hello', 'wt').write('foo')
217
test.runbzr('add hello')
218
test.runbzr('commit -m setup hello')
219
file('goodbye', 'wt').write('baz')
220
test.runbzr('add goodbye')
221
test.runbzr('commit -m setup goodbye')
222
223
def test_export(self):
224
os.mkdir('branch')
225
os.chdir('branch')
226
self.example_branch()
227
self.runbzr('export ../latest')
228
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
229
self.runbzr('export ../first -r 1')
230
assert not os.path.exists('../first/goodbye')
231
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
232
self.runbzr('export ../first.gz -r 1')
233
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
234
self.runbzr('export ../first.bz2 -r 1')
235
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
236
self.runbzr('export ../first.tar -r 1')
237
assert os.path.isfile('../first.tar')
238
from tarfile import TarFile
239
tf = TarFile('../first.tar')
240
assert 'first/hello' in tf.getnames(), tf.getnames()
241
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
242
self.runbzr('export ../first.tar.gz -r 1')
243
assert os.path.isfile('../first.tar.gz')
244
self.runbzr('export ../first.tbz2 -r 1')
245
assert os.path.isfile('../first.tbz2')
246
self.runbzr('export ../first.tar.bz2 -r 1')
247
assert os.path.isfile('../first.tar.bz2')
248
self.runbzr('export ../first.tar.tbz2 -r 1')
249
assert os.path.isfile('../first.tar.tbz2')
250
from bz2 import BZ2File
251
tf = TarFile('../first.tar.tbz2',
252
fileobj=BZ2File('../first.tar.tbz2', 'r'))
253
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
254
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
255
self.runbzr('export ../first2.tar -r 1 --root pizza')
256
tf = TarFile('../first2.tar')
257
assert 'pizza/hello' in tf.getnames(), tf.getnames()
258
259
def test_diff(self):
260
self.example_branch()
261
file('hello', 'wt').write('hello world!')
262
self.runbzr('commit -m fixing hello')
263
output = self.runbzr('diff -r 2..3', backtick=1)
264
self.assert_('\n+hello world!' in output)
265
output = self.runbzr('diff -r last:3..last:1', backtick=1)
266
self.assert_('\n+baz' in output)
267
268
def test_branch(self):
269
"""Branch from one branch to another."""
270
os.mkdir('a')
271
os.chdir('a')
272
self.example_branch()
273
os.chdir('..')
274
self.runbzr('branch a b')
275
self.runbzr('branch a c -r 1')
276
os.chdir('b')
277
self.runbzr('commit -m foo --unchanged')
278
os.chdir('..')
279
# naughty - abstraction violations RBC 20050928
280
print "test_branch used to delete the stores, how is this meant to work ?"
281
#shutil.rmtree('a/.bzr/revision-store')
282
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
283
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
284
self.runbzr('branch a d --basis b')
285
286
def test_merge(self):
287
from bzrlib.branch import Branch
288
289
os.mkdir('a')
290
os.chdir('a')
291
self.example_branch()
292
os.chdir('..')
293
self.runbzr('branch a b')
294
os.chdir('b')
295
file('goodbye', 'wt').write('quux')
296
self.runbzr(['commit', '-m', "more u's are always good"])
297
298
os.chdir('../a')
299
file('hello', 'wt').write('quuux')
300
# We can't merge when there are in-tree changes
301
self.runbzr('merge ../b', retcode=1)
302
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
303
self.runbzr('merge ../b')
304
self.check_file_contents('goodbye', 'quux')
305
# Merging a branch pulls its revision into the tree
306
a = Branch.open('.')
307
b = Branch.open('../b')
308
a.get_revision_xml(b.last_revision())
309
self.log('pending merges: %s', a.pending_merges())
310
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
311
# % (a.pending_merges(), b.last_revision())
312
313
def test_merge_with_missing_file(self):
314
"""Merge handles missing file conflicts"""
315
os.mkdir('a')
316
os.chdir('a')
317
os.mkdir('sub')
318
print >> file('sub/a.txt', 'wb'), "hello"
319
print >> file('b.txt', 'wb'), "hello"
320
print >> file('sub/c.txt', 'wb'), "hello"
321
self.runbzr('init')
322
self.runbzr('add')
323
self.runbzr(('commit', '-m', 'added a'))
324
self.runbzr('branch . ../b')
325
print >> file('sub/a.txt', 'ab'), "there"
326
print >> file('b.txt', 'ab'), "there"
327
print >> file('sub/c.txt', 'ab'), "there"
328
self.runbzr(('commit', '-m', 'Added there'))
329
os.unlink('sub/a.txt')
330
os.unlink('sub/c.txt')
331
os.rmdir('sub')
332
os.unlink('b.txt')
333
self.runbzr(('commit', '-m', 'Removed a.txt'))
334
os.chdir('../b')
335
print >> file('sub/a.txt', 'ab'), "something"
336
print >> file('b.txt', 'ab'), "something"
337
print >> file('sub/c.txt', 'ab'), "something"
338
self.runbzr(('commit', '-m', 'Modified a.txt'))
339
self.runbzr('merge ../a/')
340
assert os.path.exists('sub/a.txt.THIS')
341
assert os.path.exists('sub/a.txt.BASE')
342
os.chdir('../a')
343
self.runbzr('merge ../b/')
344
assert os.path.exists('sub/a.txt.OTHER')
345
assert os.path.exists('sub/a.txt.BASE')
346
347
def test_pull(self):
348
"""Pull changes from one branch to another."""
349
os.mkdir('a')
350
os.chdir('a')
351
352
self.example_branch()
353
self.runbzr('pull', retcode=1)
354
self.runbzr('missing', retcode=1)
355
self.runbzr('missing .')
356
self.runbzr('missing')
357
self.runbzr('pull')
358
self.runbzr('pull /', retcode=1)
359
self.runbzr('pull')
360
361
os.chdir('..')
362
self.runbzr('branch a b')
363
os.chdir('b')
364
self.runbzr('pull')
365
os.mkdir('subdir')
366
self.runbzr('add subdir')
367
self.runbzr('commit -m blah --unchanged')
368
os.chdir('../a')
369
a = Branch.open('.')
370
b = Branch.open('../b')
371
assert a.revision_history() == b.revision_history()[:-1]
372
self.runbzr('pull ../b')
373
assert a.revision_history() == b.revision_history()
374
self.runbzr('commit -m blah2 --unchanged')
375
os.chdir('../b')
376
self.runbzr('commit -m blah3 --unchanged')
377
self.runbzr('pull ../a', retcode=1)
378
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
379
return
380
os.chdir('../a')
381
self.runbzr('merge ../b')
382
self.runbzr('commit -m blah4 --unchanged')
383
os.chdir('../b/subdir')
384
self.runbzr('pull ../../a')
385
assert a.revision_history()[-1] == b.revision_history()[-1]
386
self.runbzr('commit -m blah5 --unchanged')
387
self.runbzr('commit -m blah6 --unchanged')
388
os.chdir('..')
389
self.runbzr('pull ../a')
390
os.chdir('../a')
391
self.runbzr('commit -m blah7 --unchanged')
392
self.runbzr('merge ../b')
393
self.runbzr('commit -m blah8 --unchanged')
394
self.runbzr('pull ../b')
395
self.runbzr('pull ../b')
396
397
def test_add_reports(self):
398
"""add command prints the names of added files."""
399
b = Branch.initialize('.')
400
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
401
out = self.run_bzr_captured(['add'], retcode = 0)[0]
402
# the ordering is not defined at the moment
403
results = sorted(out.rstrip('\n').split('\n'))
404
self.assertEquals(['added dir',
405
'added dir'+os.sep+'sub.txt',
406
'added top.txt',],
407
results)
408
409
def test_unknown_command(self):
410
"""Handling of unknown command."""
411
out, err = self.run_bzr_captured(['fluffy-badger'],
412
retcode=1)
413
self.assertEquals(out, '')
414
err.index('unknown command')
415
416
417
def listdir_sorted(dir):
418
L = os.listdir(dir)
419
L.sort()
420
return L
421
422
423
class OldTests(ExternalBase):
424
"""old tests moved from ./testbzr."""
425
426
def test_bzr(self):
79
self.runcmd("bzr commit -m empty", retcode=1)
80
self.runcmd("bzr add hello.txt")
81
self.runcmd("bzr commit -m added")
82
83
84
85
class OldTests(InTempDir):
86
# old tests moved from ./testbzr
87
def runTest(self):
427
88
from os import chdir, mkdir
428
89
from os.path import exists
90
import os
429
91
430
runbzr = self.runbzr
431
capture = self.capture
92
runcmd = self.runcmd
93
backtick = self.backtick
432
94
progress = self.log
433
95
434
96
progress("basic branch creation")
435
mkdir('branch1')
97
runcmd(['mkdir', 'branch1'])
436
98
chdir('branch1')
437
runbzr('init')
99
runcmd('bzr init')
438
100
439
self.assertEquals(capture('root').rstrip(),
101
self.assertEquals(backtick('bzr root').rstrip(),
440
102
os.path.join(self.test_dir, 'branch1'))
441
103
442
104
progress("status of new file")
445
107
f.write('hello world!\n')
446
108
f.close()
447
109
448
self.assertEquals(capture('unknowns'), 'test.txt\n')
110
out = backtick("bzr unknowns")
111
self.assertEquals(out, 'test.txt\n')
449
112
450
out = capture("status")
113
out = backtick("bzr status")
451
114
assert out == 'unknown:\n test.txt\n'
452
115
453
out = capture("status --all")
116
out = backtick("bzr status --all")
454
117
assert out == "unknown:\n test.txt\n"
455
118
456
out = capture("status test.txt --all")
119
out = backtick("bzr status test.txt --all")
457
120
assert out == "unknown:\n test.txt\n"
458
121
459
122
f = file('test2.txt', 'wt')
460
123
f.write('goodbye cruel world...\n')
461
124
f.close()
462
125
463
out = capture("status test.txt")
126
out = backtick("bzr status test.txt")
464
127
assert out == "unknown:\n test.txt\n"
465
128
466
out = capture("status")
129
out = backtick("bzr status")
467
130
assert out == ("unknown:\n"
468
131
" test.txt\n"
469
132
" test2.txt\n")
471
134
os.unlink('test2.txt')
472
135
473
136
progress("command aliases")
474
out = capture("st --all")
137
out = backtick("bzr st --all")
475
138
assert out == ("unknown:\n"
476
139
" test.txt\n")
477
140
478
out = capture("stat")
141
out = backtick("bzr stat")
479
142
assert out == ("unknown:\n"
480
143
" test.txt\n")
481
144
482
145
progress("command help")
483
runbzr("help st")
484
runbzr("help")
485
runbzr("help commands")
486
runbzr("help slartibartfast", 1)
146
runcmd("bzr help st")
147
runcmd("bzr help")
148
runcmd("bzr help commands")
149
runcmd("bzr help slartibartfast", 1)
487
150
488
out = capture("help ci")
151
out = backtick("bzr help ci")
489
152
out.index('aliases: ')
490
153
491
154
progress("can't rename unversioned file")
492
runbzr("rename test.txt new-test.txt", 1)
155
runcmd("bzr rename test.txt new-test.txt", 1)
493
156
494
157
progress("adding a file")
495
158
496
runbzr("add test.txt")
497
assert capture("unknowns") == ''
498
assert capture("status --all") == ("added:\n"
159
runcmd("bzr add test.txt")
160
assert backtick("bzr unknowns") == ''
161
assert backtick("bzr status --all") == ("added:\n"
499
162
" test.txt\n")
500
163
501
164
progress("rename newly-added file")
502
runbzr("rename test.txt hello.txt")
165
runcmd("bzr rename test.txt hello.txt")
503
166
assert os.path.exists("hello.txt")
504
167
assert not os.path.exists("test.txt")
505
168
506
assert capture("revno") == '0\n'
169
assert backtick("bzr revno") == '0\n'
507
170
508
171
progress("add first revision")
509
runbzr(['commit', '-m', 'add first revision'])
172
runcmd(["bzr", "commit", "-m", 'add first revision'])
510
173
511
174
progress("more complex renames")
512
175
os.mkdir("sub1")
513
runbzr("rename hello.txt sub1", 1)
514
runbzr("rename hello.txt sub1/hello.txt", 1)
515
runbzr("move hello.txt sub1", 1)
176
runcmd("bzr rename hello.txt sub1", 1)
177
runcmd("bzr rename hello.txt sub1/hello.txt", 1)
178
runcmd("bzr move hello.txt sub1", 1)
516
179
517
runbzr("add sub1")
518
runbzr("rename sub1 sub2")
519
runbzr("move hello.txt sub2")
520
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
180
runcmd("bzr add sub1")
181
runcmd("bzr rename sub1 sub2")
182
runcmd("bzr move hello.txt sub2")
183
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
521
184
522
185
assert exists("sub2")
523
186
assert exists("sub2/hello.txt")
524
187
assert not exists("sub1")
525
188
assert not exists("hello.txt")
526
189
527
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
190
runcmd(['bzr', 'commit', '-m', 'commit with some things moved to subdirs'])
528
191
529
192
mkdir("sub1")
530
runbzr('add sub1')
531
runbzr('move sub2/hello.txt sub1')
193
runcmd('bzr add sub1')
194
runcmd('bzr move sub2/hello.txt sub1')
532
195
assert not exists('sub2/hello.txt')
533
196
assert exists('sub1/hello.txt')
534
runbzr('move sub2 sub1')
197
runcmd('bzr move sub2 sub1')
535
198
assert not exists('sub2')
536
199
assert exists('sub1/sub2')
537
200
538
runbzr(['commit', '-m', 'rename nested subdirectories'])
201
runcmd(['bzr', 'commit', '-m', 'rename nested subdirectories'])
539
202
540
203
chdir('sub1/sub2')
541
self.assertEquals(capture('root')[:-1],
204
self.assertEquals(backtick('bzr root')[:-1],
542
205
os.path.join(self.test_dir, 'branch1'))
543
runbzr('move ../hello.txt .')
206
runcmd('bzr move ../hello.txt .')
544
207
assert exists('./hello.txt')
545
self.assertEquals(capture('relpath hello.txt'),
546
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
547
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
548
runbzr(['commit', '-m', 'move to parent directory'])
208
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
209
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
210
runcmd(['bzr', 'commit', '-m', 'move to parent directory'])
549
211
chdir('..')
550
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
212
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
551
213
552
runbzr('move sub2/hello.txt .')
214
runcmd('bzr move sub2/hello.txt .')
553
215
assert exists('hello.txt')
554
216
555
217
f = file('hello.txt', 'wt')
560
222
f.write('this is my new commit\n')
561
223
f.close()
562
224
563
runbzr('commit -F msg.tmp')
564
565
assert capture('revno') == '5\n'
566
runbzr('export -r 5 export-5.tmp')
567
runbzr('export export.tmp')
568
569
runbzr('log')
570
runbzr('log -v')
571
runbzr('log -v --forward')
572
runbzr('log -m', retcode=1)
573
log_out = capture('log -m commit')
574
assert "this is my new commit" in log_out
575
assert "rename nested" not in log_out
576
assert 'revision-id' not in log_out
577
assert 'revision-id' in capture('log --show-ids -m commit')
225
runcmd('bzr commit -F msg.tmp')
226
227
assert backtick('bzr revno') == '5\n'
228
runcmd('bzr export -r 5 export-5.tmp')
229
runcmd('bzr export export.tmp')
230
231
runcmd('bzr log')
232
runcmd('bzr log -v')
233
578
234
579
235
580
236
progress("file with spaces in name")
581
237
mkdir('sub directory')
582
238
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
583
runbzr('add .')
584
runbzr('diff')
585
runbzr('commit -m add-spaces')
586
runbzr('check')
587
588
runbzr('log')
589
runbzr('log --forward')
590
591
runbzr('info')
592
593
if has_symlinks():
594
progress("symlinks")
595
mkdir('symlinks')
596
chdir('symlinks')
597
runbzr('init')
598
os.symlink("NOWHERE1", "link1")
599
runbzr('add link1')
600
assert self.capture('unknowns') == ''
601
runbzr(['commit', '-m', '1: added symlink link1'])
602
603
mkdir('d1')
604
runbzr('add d1')
605
assert self.capture('unknowns') == ''
606
os.symlink("NOWHERE2", "d1/link2")
607
assert self.capture('unknowns') == 'd1/link2\n'
608
# is d1/link2 found when adding d1
609
runbzr('add d1')
610
assert self.capture('unknowns') == ''
611
os.symlink("NOWHERE3", "d1/link3")
612
assert self.capture('unknowns') == 'd1/link3\n'
613
runbzr(['commit', '-m', '2: added dir, symlink'])
614
615
runbzr('rename d1 d2')
616
runbzr('move d2/link2 .')
617
runbzr('move link1 d2')
618
assert os.readlink("./link2") == "NOWHERE2"
619
assert os.readlink("d2/link1") == "NOWHERE1"
620
runbzr('add d2/link3')
621
runbzr('diff')
622
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
623
624
os.unlink("link2")
625
os.symlink("TARGET 2", "link2")
626
os.unlink("d2/link1")
627
os.symlink("TARGET 1", "d2/link1")
628
runbzr('diff')
629
assert self.capture("relpath d2/link1") == "d2/link1\n"
630
runbzr(['commit', '-m', '4: retarget of two links'])
631
632
runbzr('remove d2/link1')
633
assert self.capture('unknowns') == 'd2/link1\n'
634
runbzr(['commit', '-m', '5: remove d2/link1'])
635
636
os.mkdir("d1")
637
runbzr('add d1')
638
runbzr('rename d2/link3 d1/link3new')
639
assert self.capture('unknowns') == 'd2/link1\n'
640
runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
641
642
runbzr(['check'])
643
644
runbzr(['export', '-r', '1', 'exp1.tmp'])
645
chdir("exp1.tmp")
646
assert listdir_sorted(".") == [ "link1" ]
647
assert os.readlink("link1") == "NOWHERE1"
648
chdir("..")
649
650
runbzr(['export', '-r', '2', 'exp2.tmp'])
651
chdir("exp2.tmp")
652
assert listdir_sorted(".") == [ "d1", "link1" ]
653
chdir("..")
654
655
runbzr(['export', '-r', '3', 'exp3.tmp'])
656
chdir("exp3.tmp")
657
assert listdir_sorted(".") == [ "d2", "link2" ]
658
assert listdir_sorted("d2") == [ "link1", "link3" ]
659
assert os.readlink("d2/link1") == "NOWHERE1"
660
assert os.readlink("link2") == "NOWHERE2"
661
chdir("..")
662
663
runbzr(['export', '-r', '4', 'exp4.tmp'])
664
chdir("exp4.tmp")
665
assert listdir_sorted(".") == [ "d2", "link2" ]
666
assert os.readlink("d2/link1") == "TARGET 1"
667
assert os.readlink("link2") == "TARGET 2"
668
assert listdir_sorted("d2") == [ "link1", "link3" ]
669
chdir("..")
670
671
runbzr(['export', '-r', '5', 'exp5.tmp'])
672
chdir("exp5.tmp")
673
assert listdir_sorted(".") == [ "d2", "link2" ]
674
assert os.path.islink("link2")
675
assert listdir_sorted("d2")== [ "link3" ]
676
chdir("..")
677
678
runbzr(['export', '-r', '6', 'exp6.tmp'])
679
chdir("exp6.tmp")
680
assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
681
assert listdir_sorted("d1") == [ "link3new" ]
682
assert listdir_sorted("d2") == []
683
assert os.readlink("d1/link3new") == "NOWHERE3"
684
chdir("..")
685
else:
686
progress("skipping symlink tests")
687
688
689
class HttpTests(TestCaseWithWebserver):
690
"""Test bzr ui commands against remote branches."""
691
692
def test_branch(self):
693
os.mkdir('from')
694
branch = Branch.initialize('from')
695
branch.commit('empty commit for nonsense', allow_pointless=True)
696
url = self.get_remote_url('from')
697
self.run_bzr('branch', url, 'to')
698
branch = Branch.open('to')
699
self.assertEqual(1, len(branch.revision_history()))
239
runcmd('bzr add .')
240
runcmd('bzr diff')
241
runcmd('bzr commit -m add-spaces')
242
runcmd('bzr check')
243
244
runcmd('bzr log')
245
runcmd('bzr log --forward')
246
247
runcmd('bzr info')
248
249
250
251
252
253
254
chdir('..')
255
chdir('..')
256
progress('branch')
257
# Can't create a branch if it already exists
258
runcmd('bzr branch branch1', retcode=1)
259
# Can't create a branch if its parent doesn't exist
260
runcmd('bzr branch /unlikely/to/exist', retcode=1)
261
runcmd('bzr branch branch1 branch2')
262
263
progress("pull")
264
chdir('branch1')
265
runcmd('bzr pull', retcode=1)
266
runcmd('bzr pull ../branch2')
267
chdir('.bzr')
268
runcmd('bzr pull')
269
runcmd('bzr commit --unchanged -m empty')
270
runcmd('bzr pull')
271
chdir('../../branch2')
272
runcmd('bzr pull')
273
runcmd('bzr commit --unchanged -m empty')
274
chdir('../branch1')
275
runcmd('bzr commit --unchanged -m empty')
276
runcmd('bzr pull', retcode=1)
277
chdir ('..')
278
279
progress('status after remove')
280
mkdir('status-after-remove')
281
# see mail from William Dodé, 2005-05-25
282
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
283
# * looking for changes...
284
# added a
285
# * commited r1
286
# $ bzr remove a
287
# $ bzr status
288
# bzr: local variable 'kind' referenced before assignment
289
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
290
# see ~/.bzr.log for debug information
291
chdir('status-after-remove')
292
runcmd('bzr init')
293
file('a', 'w').write('foo')
294
runcmd('bzr add a')
295
runcmd(['bzr', 'commit', '-m', 'add a'])
296
runcmd('bzr remove a')
297
runcmd('bzr status')
298
299
chdir('..')
300
301
progress('ignore patterns')
302
mkdir('ignorebranch')
303
chdir('ignorebranch')
304
runcmd('bzr init')
305
assert backtick('bzr unknowns') == ''
306
307
file('foo.tmp', 'wt').write('tmp files are ignored')
308
assert backtick('bzr unknowns') == ''
309
310
file('foo.c', 'wt').write('int main() {}')
311
assert backtick('bzr unknowns') == 'foo.c\n'
312
runcmd('bzr add foo.c')
313
assert backtick('bzr unknowns') == ''
314
315
# 'ignore' works when creating the .bzignore file
316
file('foo.blah', 'wt').write('blah')
317
assert backtick('bzr unknowns') == 'foo.blah\n'
318
runcmd('bzr ignore *.blah')
319
assert backtick('bzr unknowns') == ''
320
assert file('.bzrignore', 'rb').read() == '*.blah\n'
321
322
# 'ignore' works when then .bzrignore file already exists
323
file('garh', 'wt').write('garh')
324
assert backtick('bzr unknowns') == 'garh\n'
325
runcmd('bzr ignore garh')
326
assert backtick('bzr unknowns') == ''
327
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
328
329
chdir('..')
330
331
332
333
334
progress("recursive and non-recursive add")
335
mkdir('no-recurse')
336
chdir('no-recurse')
337
runcmd('bzr init')
338
mkdir('foo')
339
fp = os.path.join('foo', 'test.txt')
340
f = file(fp, 'w')
341
f.write('hello!\n')
342
f.close()
343
runcmd('bzr add --no-recurse foo')
344
runcmd('bzr file-id foo')
345
runcmd('bzr file-id ' + fp, 1) # not versioned yet
346
runcmd('bzr commit -m add-dir-only')
347
348
runcmd('bzr file-id ' + fp, 1) # still not versioned
349
350
runcmd('bzr add foo')
351
runcmd('bzr file-id ' + fp)
352
runcmd('bzr commit -m add-sub-file')
353
354
chdir('..')
355
356
357
358
class RevertCommand(InTempDir):
359
def runTest(self):
360
self.runcmd('bzr init')
361
362
file('hello', 'wt').write('foo')
363
self.runcmd('bzr add hello')
364
self.runcmd('bzr commit -m setup hello')
365
366
file('hello', 'wt').write('bar')
367
self.runcmd('bzr revert hello')
368
self.check_file_contents('hello', 'foo')
369
370
371
372
373
374
# lists all tests from this module in the best order to run them. we
375
# do it this way rather than just discovering them all because it
376
# allows us to test more basic functions first where failures will be
377
# easiest to understand.
378
TEST_CLASSES = [TestVersion,
379
InitBranch,
380
HelpCommands,
381
UserIdentity,
382
InvalidCommands,
383
RevertCommand,
384
OldTests,
385
EmptyCommit,
386
]
Loggerhead is a web-based interface for Breezy
Version: 2.0.1