1
# Copyright (C) 2005 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
2
2
# -*- coding: utf-8 -*-
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
6
6
# the Free Software Foundation; either version 2 of the License, or
7
7
# (at your option) any later version.
9
9
# This program is distributed in the hope that it will be useful,
10
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
12
# GNU General Public License for more details.
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
# Mr. Smoketoomuch: I'm sorry?
19
# Mr. Bounder: You'd better cut down a little then.
20
# Mr. Smoketoomuch: Oh, I see! Smoke too much so I'd better cut down a little
23
19
"""Black-box tests for bzr.
25
21
These check that it behaves properly when it's invoked through the regular
26
command-line interface. This doesn't actually run a new interpreter but
27
rather starts again from the run_bzr function.
22
command-line interface.
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.
31
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
32
# Note: Please don't add new tests here, it's too big and bulky. Instead add
33
# them into small suites in bzrlib.tests.blackbox.test_FOO for the particular
34
# UI command/aspect that is being tested.
37
from cStringIO import StringIO
46
from bzrlib.branch import Branch
47
from bzrlib.errors import BzrCommandError
48
from bzrlib.osutils import (
53
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
54
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
55
from bzrlib.tests.blackbox import ExternalBase
56
from bzrlib.workingtree import WorkingTree
59
class TestCommands(ExternalBase):
61
def test_invalid_commands(self):
62
self.runbzr("pants", retcode=3)
63
self.runbzr("--pants off", retcode=3)
64
self.runbzr("diff --message foo", retcode=3)
66
def test_revert(self):
69
file('hello', 'wt').write('foo')
70
self.runbzr('add hello')
71
self.runbzr('commit -m setup hello')
73
file('goodbye', 'wt').write('baz')
74
self.runbzr('add goodbye')
75
self.runbzr('commit -m setup goodbye')
77
file('hello', 'wt').write('bar')
78
file('goodbye', 'wt').write('qux')
79
self.runbzr('revert hello')
80
self.check_file_contents('hello', 'foo')
81
self.check_file_contents('goodbye', 'qux')
83
self.check_file_contents('goodbye', 'baz')
86
self.runbzr('add revertdir')
87
self.runbzr('commit -m f')
92
os.symlink('/unlikely/to/exist', 'symlink')
93
self.runbzr('add symlink')
94
self.runbzr('commit -m f')
97
self.failUnlessExists('symlink')
99
os.symlink('a-different-path', 'symlink')
100
self.runbzr('revert')
101
self.assertEqual('/unlikely/to/exist',
102
os.readlink('symlink'))
104
self.log("skipping revert symlink tests")
106
file('hello', 'wt').write('xyz')
107
self.runbzr('commit -m xyz hello')
108
self.runbzr('revert -r 1 hello')
109
self.check_file_contents('hello', 'foo')
110
self.runbzr('revert hello')
111
self.check_file_contents('hello', 'xyz')
112
os.chdir('revertdir')
113
self.runbzr('revert')
116
def test_main_version(self):
117
"""Check output from version command and master option is reasonable"""
29
# this code was previously in testbzr
31
from unittest import TestCase
32
from bzrlib.selftest import TestBase, InTempDir
34
class TestVersion(TestBase):
118
36
# output is intentionally passed through to stdout so that we
119
37
# can see the version being tested
120
output = self.runbzr('version', backtick=1)
121
self.log('bzr version output:')
123
self.assert_(output.startswith('Bazaar (bzr) '))
124
self.assertNotEqual(output.index('Canonical'), -1)
125
# make sure --version is consistent
126
tmp_output = self.runbzr('--version', backtick=1)
127
self.log('bzr --version output:')
129
self.assertEquals(output, tmp_output)
131
def example_branch(test):
133
file('hello', 'wt').write('foo')
134
test.runbzr('add hello')
135
test.runbzr('commit -m setup hello')
136
file('goodbye', 'wt').write('baz')
137
test.runbzr('add goodbye')
138
test.runbzr('commit -m setup goodbye')
140
def test_pull_verbose(self):
141
"""Pull changes from one branch to another and watch the output."""
147
self.example_branch()
152
open('b', 'wb').write('else\n')
154
bzr(['commit', '-m', 'added b'])
157
out = bzr('pull --verbose ../b', backtick=True)
158
self.failIfEqual(out.find('Added Revisions:'), -1)
159
self.failIfEqual(out.find('message:\n added b'), -1)
160
self.failIfEqual(out.find('added b'), -1)
162
# Check that --overwrite --verbose prints out the removed entries
163
bzr('commit -m foo --unchanged')
165
bzr('commit -m baz --unchanged')
166
bzr('pull ../a', retcode=3)
167
out = bzr('pull --overwrite --verbose ../a', backtick=1)
169
remove_loc = out.find('Removed Revisions:')
170
self.failIfEqual(remove_loc, -1)
171
added_loc = out.find('Added Revisions:')
172
self.failIfEqual(added_loc, -1)
174
removed_message = out.find('message:\n baz')
175
self.failIfEqual(removed_message, -1)
176
self.failUnless(remove_loc < removed_message < added_loc)
178
added_message = out.find('message:\n foo')
179
self.failIfEqual(added_message, -1)
180
self.failUnless(added_loc < added_message)
182
def test_locations(self):
183
"""Using and remembering different locations"""
187
self.runbzr('commit -m unchanged --unchanged')
188
self.runbzr('pull', retcode=3)
189
self.runbzr('merge', retcode=3)
190
self.runbzr('branch . ../b')
193
self.runbzr('branch . ../c')
194
self.runbzr('pull ../c')
197
self.runbzr('pull ../b')
199
self.runbzr('pull ../c')
200
self.runbzr('branch ../c ../d')
201
osutils.rmtree('../c')
206
self.runbzr('pull', retcode=3)
207
self.runbzr('pull ../a --remember')
210
def test_unknown_command(self):
211
"""Handling of unknown command."""
212
out, err = self.run_bzr_captured(['fluffy-badger'],
214
self.assertEquals(out, '')
215
err.index('unknown command')
217
def create_conflicts(self):
218
"""Create a conflicted tree"""
221
file('hello', 'wb').write("hi world")
222
file('answer', 'wb').write("42")
225
self.runbzr('commit -m base')
226
self.runbzr('branch . ../other')
227
self.runbzr('branch . ../this')
229
file('hello', 'wb').write("Hello.")
230
file('answer', 'wb').write("Is anyone there?")
231
self.runbzr('commit -m other')
233
file('hello', 'wb').write("Hello, world")
234
self.runbzr('mv answer question')
235
file('question', 'wb').write("What do you get when you multiply six"
237
self.runbzr('commit -m this')
239
def test_status(self):
243
self.runbzr('commit --unchanged --message f')
244
self.runbzr('branch . ../branch2')
245
self.runbzr('branch . ../branch3')
246
self.runbzr('commit --unchanged --message peter')
247
os.chdir('../branch2')
248
self.runbzr('merge ../branch1')
249
self.runbzr('commit --unchanged --message pumpkin')
250
os.chdir('../branch3')
251
self.runbzr('merge ../branch2')
252
message = self.capture('status')
255
def test_conflicts(self):
256
"""Handling of merge conflicts"""
257
self.create_conflicts()
258
self.runbzr('merge ../other --show-base', retcode=1)
259
conflict_text = file('hello').read()
260
self.assert_('<<<<<<<' in conflict_text)
261
self.assert_('>>>>>>>' in conflict_text)
262
self.assert_('=======' in conflict_text)
263
self.assert_('|||||||' in conflict_text)
264
self.assert_('hi world' in conflict_text)
265
self.runbzr('revert')
266
self.runbzr('resolve --all')
267
self.runbzr('merge ../other', retcode=1)
268
conflict_text = file('hello').read()
269
self.assert_('|||||||' not in conflict_text)
270
self.assert_('hi world' not in conflict_text)
271
result = self.runbzr('conflicts', backtick=1)
272
self.assertEquals(result, "Text conflict in hello\nText conflict in"
274
result = self.runbzr('status', backtick=1)
275
self.assert_("conflicts:\n Text conflict in hello\n"
276
" Text conflict in question\n" in result, result)
277
self.runbzr('resolve hello')
278
result = self.runbzr('conflicts', backtick=1)
279
self.assertEquals(result, "Text conflict in question\n")
280
self.runbzr('commit -m conflicts', retcode=3)
281
self.runbzr('resolve --all')
282
result = self.runbzr('conflicts', backtick=1)
283
self.runbzr('commit -m conflicts')
284
self.assertEquals(result, "")
287
# create a source branch
288
os.mkdir('my-branch')
289
os.chdir('my-branch')
290
self.example_branch()
292
# with no push target, fail
293
self.runbzr('push', retcode=3)
294
# with an explicit target work
295
self.runbzr('push ../output-branch')
296
# with an implicit target work
299
self.runbzr('missing ../output-branch')
300
# advance this branch
301
self.runbzr('commit --unchanged -m unchanged')
303
os.chdir('../output-branch')
304
# There is no longer a difference as long as we have
305
# access to the working tree
308
# But we should be missing a revision
309
self.runbzr('missing ../my-branch', retcode=1)
311
# diverge the branches
312
self.runbzr('commit --unchanged -m unchanged')
313
os.chdir('../my-branch')
315
self.runbzr('push', retcode=3)
316
# and there are difference
317
self.runbzr('missing ../output-branch', retcode=1)
318
self.runbzr('missing --verbose ../output-branch', retcode=1)
319
# but we can force a push
320
self.runbzr('push --overwrite')
322
self.runbzr('missing ../output-branch')
324
# pushing to a new dir with no parent should fail
325
self.runbzr('push ../missing/new-branch', retcode=3)
326
# unless we provide --create-prefix
327
self.runbzr('push --create-prefix ../missing/new-branch')
329
self.runbzr('missing ../missing/new-branch')
331
def test_external_command(self):
332
"""Test that external commands can be run by setting the path
334
# We don't at present run bzr in a subprocess for blackbox tests, and so
335
# don't really capture stdout, only the internal python stream.
336
# Therefore we don't use a subcommand that produces any output or does
337
# anything -- we just check that it can be run successfully.
338
cmd_name = 'test-command'
339
if sys.platform == 'win32':
341
oldpath = os.environ.get('BZRPATH', None)
344
if 'BZRPATH' in os.environ:
345
del os.environ['BZRPATH']
347
f = file(cmd_name, 'wb')
348
if sys.platform == 'win32':
349
f.write('@echo off\n')
351
f.write('#!/bin/sh\n')
352
# f.write('echo Hello from test-command')
354
os.chmod(cmd_name, 0755)
356
# It should not find the command in the local
357
# directory by default, since it is not in my path
358
bzr(cmd_name, retcode=3)
360
# Now put it into my path
361
os.environ['BZRPATH'] = '.'
365
# Make sure empty path elements are ignored
366
os.environ['BZRPATH'] = os.pathsep
368
bzr(cmd_name, retcode=3)
372
os.environ['BZRPATH'] = oldpath
375
def listdir_sorted(dir):
381
class OldTests(ExternalBase):
382
"""old tests moved from ./testbzr."""
38
self.runcmd(['bzr', 'version'])
42
class HelpCommands(TestBase):
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')
51
class InitBranch(InTempDir):
54
self.runcmd(['bzr', 'init'])
58
class UserIdentity(InTempDir):
60
# this should always identify something, if only "john@localhost"
61
self.runcmd("bzr whoami")
62
self.runcmd("bzr whoami --email")
63
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
67
class InvalidCommands(InTempDir):
69
self.runcmd("bzr pants", retcode=1)
70
self.runcmd("bzr --pants off", retcode=1)
71
self.runcmd("bzr diff --message foo", retcode=1)
75
class OldTests(InTempDir):
76
# old tests moved from ./testbzr
385
78
from os import chdir, mkdir
386
79
from os.path import exists
389
capture = self.capture
83
backtick = self.backtick
390
84
progress = self.log
392
86
progress("basic branch creation")
87
runcmd(['mkdir', 'branch1'])
397
self.assertEquals(capture('root').rstrip(),
398
pathjoin(self.test_dir, 'branch1'))
91
self.assertEquals(backtick('bzr root').rstrip(),
92
os.path.join(self.test_dir, 'branch1'))
400
94
progress("status of new file")
403
97
f.write('hello world!\n')
406
self.assertEquals(capture('unknowns'), 'test.txt\n')
408
out = capture("status")
409
self.assertEquals(out, 'unknown:\n test.txt\n')
100
out = backtick("bzr unknowns")
101
self.assertEquals(out, 'test.txt\n')
103
out = backtick("bzr status")
104
assert out == 'unknown:\n test.txt\n'
106
out = backtick("bzr status --all")
107
assert out == "unknown:\n test.txt\n"
109
out = backtick("bzr status test.txt --all")
110
assert out == "unknown:\n test.txt\n"
411
112
f = file('test2.txt', 'wt')
412
113
f.write('goodbye cruel world...\n')
415
out = capture("status test.txt")
416
self.assertEquals(out, "unknown:\n test.txt\n")
116
out = backtick("bzr status test.txt")
117
assert out == "unknown:\n test.txt\n"
418
out = capture("status")
419
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
119
out = backtick("bzr status")
120
assert out == ("unknown:\n"
421
124
os.unlink('test2.txt')
423
126
progress("command aliases")
425
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
127
out = backtick("bzr st --all")
128
assert out == ("unknown:\n"
427
out = capture("stat")
428
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
131
out = backtick("bzr stat")
132
assert out == ("unknown:\n"
430
135
progress("command help")
433
runbzr("help commands")
434
runbzr("help slartibartfast", 3)
136
runcmd("bzr help st")
138
runcmd("bzr help commands")
139
runcmd("bzr help slartibartfast", 1)
436
out = capture("help ci")
141
out = backtick("bzr help ci")
437
142
out.index('aliases: ')
144
progress("can't rename unversioned file")
145
runcmd("bzr rename test.txt new-test.txt", 1)
147
progress("adding a file")
149
runcmd("bzr add test.txt")
150
assert backtick("bzr unknowns") == ''
151
assert backtick("bzr status --all") == ("added:\n"
154
progress("rename newly-added file")
155
runcmd("bzr rename test.txt hello.txt")
156
assert os.path.exists("hello.txt")
157
assert not os.path.exists("test.txt")
159
assert backtick("bzr revno") == '0\n'
161
progress("add first revision")
162
runcmd(["bzr", "commit", "-m", 'add first revision'])
164
progress("more complex renames")
166
runcmd("bzr rename hello.txt sub1", 1)
167
runcmd("bzr rename hello.txt sub1/hello.txt", 1)
168
runcmd("bzr move hello.txt sub1", 1)
170
runcmd("bzr add sub1")
171
runcmd("bzr rename sub1 sub2")
172
runcmd("bzr move hello.txt sub2")
173
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
175
assert exists("sub2")
176
assert exists("sub2/hello.txt")
177
assert not exists("sub1")
178
assert not exists("hello.txt")
180
runcmd(['bzr', 'commit', '-m', 'commit with some things moved to subdirs'])
183
runcmd('bzr add sub1')
184
runcmd('bzr move sub2/hello.txt sub1')
185
assert not exists('sub2/hello.txt')
186
assert exists('sub1/hello.txt')
187
runcmd('bzr move sub2 sub1')
188
assert not exists('sub2')
189
assert exists('sub1/sub2')
191
runcmd(['bzr', 'commit', '-m', 'rename nested subdirectories'])
194
self.assertEquals(backtick('bzr root')[:-1],
195
os.path.join(self.test_dir, 'branch1'))
196
runcmd('bzr move ../hello.txt .')
197
assert exists('./hello.txt')
198
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
199
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
200
runcmd(['bzr', 'commit', '-m', 'move to parent directory'])
202
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
204
runcmd('bzr move sub2/hello.txt .')
205
assert exists('hello.txt')
439
207
f = file('hello.txt', 'wt')
440
208
f.write('some nice new content\n')
443
runbzr("add hello.txt")
445
211
f = file('msg.tmp', 'wt')
446
f.write('this is my new commit\nand it has multiple lines, for fun')
212
f.write('this is my new commit\n')
449
runbzr('commit -F msg.tmp')
451
self.assertEquals(capture('revno'), '1\n')
452
runbzr('export -r 1 export-1.tmp')
453
runbzr('export export.tmp')
457
runbzr('log -v --forward')
458
runbzr('log -m', retcode=3)
459
log_out = capture('log -m commit')
460
self.assert_("this is my new commit\n and" in log_out)
461
self.assert_("rename nested" not in log_out)
462
self.assert_('revision-id' not in log_out)
463
self.assert_('revision-id' in capture('log --show-ids -m commit'))
465
log_out = capture('log --line')
466
# determine the widest line we want
467
max_width = terminal_width() - 1
468
for line in log_out.splitlines():
469
self.assert_(len(line) <= max_width, len(line))
470
self.assert_("this is my new commit and" not in log_out)
471
self.assert_("this is my new commit" in log_out)
215
runcmd('bzr commit -F msg.tmp')
217
assert backtick('bzr revno') == '5\n'
218
runcmd('bzr export -r 5 export-5.tmp')
219
runcmd('bzr export export.tmp')
473
226
progress("file with spaces in name")
474
227
mkdir('sub directory')
475
228
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
477
runbzr('diff', retcode=1)
478
runbzr('commit -m add-spaces')
482
runbzr('log --forward')
491
os.symlink("NOWHERE1", "link1")
493
self.assertEquals(self.capture('unknowns'), '')
494
runbzr(['commit', '-m', '1: added symlink link1'])
498
self.assertEquals(self.capture('unknowns'), '')
499
os.symlink("NOWHERE2", "d1/link2")
500
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
501
# is d1/link2 found when adding d1
503
self.assertEquals(self.capture('unknowns'), '')
504
os.symlink("NOWHERE3", "d1/link3")
505
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
506
runbzr(['commit', '-m', '2: added dir, symlink'])
508
runbzr('rename d1 d2')
509
runbzr('move d2/link2 .')
510
runbzr('move link1 d2')
511
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
512
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
513
runbzr('add d2/link3')
514
runbzr('diff', retcode=1)
515
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
518
os.symlink("TARGET 2", "link2")
519
os.unlink("d2/link1")
520
os.symlink("TARGET 1", "d2/link1")
521
runbzr('diff', retcode=1)
522
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
523
runbzr(['commit', '-m', '4: retarget of two links'])
525
runbzr('remove d2/link1')
526
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
527
runbzr(['commit', '-m', '5: remove d2/link1'])
528
# try with the rm alias
529
runbzr('add d2/link1')
530
runbzr(['commit', '-m', '6: add d2/link1'])
531
runbzr('rm d2/link1')
532
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
533
runbzr(['commit', '-m', '7: remove d2/link1'])
537
runbzr('rename d2/link3 d1/link3new')
538
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
539
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
543
runbzr(['export', '-r', '1', 'exp1.tmp'])
545
self.assertEquals(listdir_sorted("."), [ "link1" ])
546
self.assertEquals(os.readlink("link1"), "NOWHERE1")
549
runbzr(['export', '-r', '2', 'exp2.tmp'])
551
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
554
runbzr(['export', '-r', '3', 'exp3.tmp'])
556
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
557
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
558
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
559
self.assertEquals(os.readlink("link2") , "NOWHERE2")
562
runbzr(['export', '-r', '4', 'exp4.tmp'])
564
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
565
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
566
self.assertEquals(os.readlink("link2") , "TARGET 2")
567
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
570
runbzr(['export', '-r', '5', 'exp5.tmp'])
572
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
573
self.assert_(os.path.islink("link2"))
574
self.assert_(listdir_sorted("d2")== [ "link3" ])
577
runbzr(['export', '-r', '8', 'exp6.tmp'])
579
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
580
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
581
self.assertEquals(listdir_sorted("d2"), [])
582
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
585
progress("skipping symlink tests")
588
class RemoteTests(object):
589
"""Test bzr ui commands against remote branches."""
591
def test_branch(self):
593
wt = self.make_branch_and_tree('from')
595
wt.commit('empty commit for nonsense', allow_pointless=True)
596
url = self.get_readonly_url('from')
597
self.run_bzr('branch', url, 'to')
598
branch = Branch.open('to')
599
self.assertEqual(1, len(branch.revision_history()))
600
# the branch should be set in to to from
601
self.assertEqual(url + '/', branch.get_parent())
604
self.build_tree(['branch/', 'branch/file'])
605
self.capture('init branch')
606
self.capture('add branch/file')
607
self.capture('commit -m foo branch')
608
url = self.get_readonly_url('branch/file')
609
output = self.capture('log %s' % url)
610
self.assertEqual(8, len(output.split('\n')))
612
def test_check(self):
613
self.build_tree(['branch/', 'branch/file'])
614
self.capture('init branch')
615
self.capture('add branch/file')
616
self.capture('commit -m foo branch')
617
url = self.get_readonly_url('branch/')
618
self.run_bzr('check', url)
621
# create a source branch
622
os.mkdir('my-branch')
623
os.chdir('my-branch')
231
runcmd('bzr commit -m add-spaces')
235
runcmd('bzr log --forward')
247
# Can't create a branch if it already exists
248
runcmd('bzr branch branch1', retcode=1)
249
# Can't create a branch if its parent doesn't exist
250
runcmd('bzr branch /unlikely/to/exist', retcode=1)
251
runcmd('bzr branch branch1 branch2')
255
runcmd('bzr pull', retcode=1)
256
runcmd('bzr pull ../branch2')
259
runcmd('bzr commit -m empty')
261
chdir('../../branch2')
263
runcmd('bzr commit -m empty')
265
runcmd('bzr commit -m empty')
266
runcmd('bzr pull', retcode=1)
269
progress('status after remove')
270
mkdir('status-after-remove')
271
# see mail from William Dodé, 2005-05-25
272
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
273
# * looking for changes...
278
# bzr: local variable 'kind' referenced before assignment
279
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
280
# see ~/.bzr.log for debug information
281
chdir('status-after-remove')
283
file('a', 'w').write('foo')
285
runcmd(['bzr', 'commit', '-m', 'add a'])
286
runcmd('bzr remove a')
291
progress('ignore patterns')
292
mkdir('ignorebranch')
293
chdir('ignorebranch')
295
assert backtick('bzr unknowns') == ''
297
file('foo.tmp', 'wt').write('tmp files are ignored')
298
assert backtick('bzr unknowns') == ''
300
file('foo.c', 'wt').write('int main() {}')
301
assert backtick('bzr unknowns') == 'foo.c\n'
302
runcmd('bzr add foo.c')
303
assert backtick('bzr unknowns') == ''
305
# 'ignore' works when creating the .bzignore file
306
file('foo.blah', 'wt').write('blah')
307
assert backtick('bzr unknowns') == 'foo.blah\n'
308
runcmd('bzr ignore *.blah')
309
assert backtick('bzr unknowns') == ''
310
assert file('.bzrignore', 'rb').read() == '*.blah\n'
312
# 'ignore' works when then .bzrignore file already exists
313
file('garh', 'wt').write('garh')
314
assert backtick('bzr unknowns') == 'garh\n'
315
runcmd('bzr ignore garh')
316
assert backtick('bzr unknowns') == ''
317
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
324
progress("recursive and non-recursive add")
329
fp = os.path.join('foo', 'test.txt')
333
runcmd('bzr add --no-recurse foo')
334
runcmd('bzr file-id foo')
335
runcmd('bzr file-id ' + fp, 1) # not versioned yet
336
runcmd('bzr commit -m add-dir-only')
338
runcmd('bzr file-id ' + fp, 1) # still not versioned
340
runcmd('bzr add foo')
341
runcmd('bzr file-id ' + fp)
342
runcmd('bzr commit -m add-sub-file')
348
class RevertCommand(InTempDir):
350
self.runcmd('bzr init')
625
352
file('hello', 'wt').write('foo')
626
self.run_bzr('add', 'hello')
627
self.run_bzr('commit', '-m', 'setup')
629
# with an explicit target work
630
self.run_bzr('push', self.get_url('output-branch'))
633
class HTTPTests(TestCaseWithWebserver, RemoteTests):
634
"""Test various commands against a HTTP server."""
637
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
638
"""Test various commands against a SFTP server using abs paths."""
641
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
642
"""Test various commands against a SFTP server using abs paths."""
645
super(SFTPTestsAbsoluteSibling, self).setUp()
646
self._override_home = '/dev/noone/runs/tests/here'
649
class SFTPTestsRelative(TestCaseWithSFTPServer, RemoteTests):
650
"""Test various commands against a SFTP server using homedir rel paths."""
653
super(SFTPTestsRelative, self).setUp()
654
self._get_remote_is_absolute = False
353
self.runcmd('bzr add hello')
354
self.runcmd('bzr commit -m setup hello')
356
file('hello', 'wt').write('bar')
357
self.runcmd('bzr revert hello')
358
self.check_file_contents('hello', 'foo')
364
# lists all tests from this module in the best order to run them. we
365
# do it this way rather than just discovering them all because it
366
# allows us to test more basic functions first where failures will be
367
# easiest to understand.
370
from unittest import TestSuite
372
s.addTests([TestVersion(),
added
removed
bzrlib/selftest/blackbox.py
