42
45
if isinstance(args, basestring):
43
46
args = args.split()
46
return self.backtick(['python', self.BZRPATH,] + args,
49
return self.runcmd(['python', self.BZRPATH,] + args,
52
class TestCommands(ExternalBase):
54
def test_help_commands(self):
48
return self.runcmd(['python', self.BZRPATH,] + args,
53
class TestVersion(ExternalBase):
55
# output is intentionally passed through to stdout so that we
56
# can see the version being tested
57
self.runbzr(['version'])
61
class HelpCommands(ExternalBase):
55
63
self.runbzr('--help')
56
64
self.runbzr('help')
57
65
self.runbzr('help commands')
58
66
self.runbzr('help help')
59
67
self.runbzr('commit -h')
61
def test_init_branch(self):
70
class InitBranch(ExternalBase):
63
73
self.runbzr(['init'])
65
def test_whoami(self):
77
class UserIdentity(ExternalBase):
66
79
# this should always identify something, if only "john@localhost"
67
80
self.runbzr("whoami")
68
81
self.runbzr("whoami --email")
70
self.assertEquals(self.runbzr("whoami --email",
71
backtick=True).count('@'), 1)
73
def test_whoami_branch(self):
74
"""branch specific user identity works."""
76
f = file('.bzr/email', 'wt')
77
f.write('Branch Identity <branch@identi.ty>')
79
whoami = self.runbzr("whoami",backtick=True)
80
whoami_email = self.runbzr("whoami --email",backtick=True)
81
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
82
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
84
def test_invalid_commands(self):
82
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
86
class InvalidCommands(ExternalBase):
85
88
self.runbzr("pants", retcode=1)
86
89
self.runbzr("--pants off", retcode=1)
87
90
self.runbzr("diff --message foo", retcode=1)
89
def test_empty_commit(self):
94
class EmptyCommit(ExternalBase):
90
96
self.runbzr("init")
91
97
self.build_tree(['hello.txt'])
92
98
self.runbzr("commit -m empty", retcode=1)
93
99
self.runbzr("add hello.txt")
94
100
self.runbzr("commit -m added")
96
def test_ignore_patterns(self):
104
class IgnorePatterns(ExternalBase):
97
106
from bzrlib.branch import Branch
99
108
b = Branch('.', init=True)
124
133
self.runbzr('ignore garh')
125
134
self.assertEquals(list(b.unknowns()), [])
126
135
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
128
def test_revert(self):
132
file('hello', 'wt').write('foo')
133
self.runbzr('add hello')
134
self.runbzr('commit -m setup hello')
136
file('goodbye', 'wt').write('baz')
137
self.runbzr('add goodbye')
138
self.runbzr('commit -m setup goodbye')
140
file('hello', 'wt').write('bar')
141
file('goodbye', 'wt').write('qux')
142
self.runbzr('revert hello')
143
self.check_file_contents('hello', 'foo')
144
self.check_file_contents('goodbye', 'qux')
145
self.runbzr('revert')
146
self.check_file_contents('goodbye', 'baz')
148
os.mkdir('revertdir')
149
self.runbzr('add revertdir')
150
self.runbzr('commit -m f')
151
os.rmdir('revertdir')
152
self.runbzr('revert')
154
def skipped_test_mv_modes(self):
155
"""Test two modes of operation for mv"""
156
from bzrlib.branch import Branch
157
b = Branch('.', init=True)
158
self.build_tree(['a', 'c', 'subdir/'])
159
self.run_bzr('mv', 'a', 'b')
160
self.run_bzr('mv', 'b', 'subdir')
161
self.run_bzr('mv', 'subdir/b', 'a')
162
self.run_bzr('mv', 'a', 'b', 'subdir')
163
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
165
def test_main_version(self):
166
"""Check output from version command and master option is reasonable"""
167
# output is intentionally passed through to stdout so that we
168
# can see the version being tested
169
output = self.runbzr('version', backtick=1)
170
self.log('bzr version output:')
172
self.assert_(output.startswith('bzr (bazaar-ng) '))
173
self.assertNotEqual(output.index('Canonical'), -1)
174
# make sure --version is consistent
175
tmp_output = self.runbzr('--version', backtick=1)
176
self.log('bzr --version output:')
178
self.assertEquals(output, tmp_output)
180
def example_branch(test):
182
file('hello', 'wt').write('foo')
183
test.runbzr('add hello')
184
test.runbzr('commit -m setup hello')
185
file('goodbye', 'wt').write('baz')
186
test.runbzr('add goodbye')
187
test.runbzr('commit -m setup goodbye')
189
def test_revert(self):
190
self.example_branch()
191
file('hello', 'wt').write('bar')
192
file('goodbye', 'wt').write('qux')
193
self.runbzr('revert hello')
194
self.check_file_contents('hello', 'foo')
195
self.check_file_contents('goodbye', 'qux')
196
self.runbzr('revert')
197
self.check_file_contents('goodbye', 'baz')
199
def test_merge(self):
200
from bzrlib.branch import Branch
201
from bzrlib.commands import run_bzr
207
self.example_branch()
209
self.runbzr('branch a b')
211
file('goodbye', 'wt').write('quux')
212
self.runbzr(['commit', '-m', "more u's are always good"])
215
file('hello', 'wt').write('quuux')
216
# We can't merge when there are in-tree changes
217
self.runbzr('merge ../b', retcode=1)
218
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
219
self.runbzr('merge ../b')
220
self.check_file_contents('goodbye', 'quux')
221
# Merging a branch pulls its revision into the tree
224
a.get_revision_xml(b.last_patch())
226
self.log('pending merges: %s', a.pending_merges())
227
# assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
228
# % (a.pending_merges(), b.last_patch())
230
140
class OldTests(ExternalBase):
231
"""old tests moved from ./testbzr."""
141
# old tests moved from ./testbzr
234
143
from os import chdir, mkdir
235
144
from os.path import exists
318
assert os.path.exists('branch1')
319
assert not os.path.exists('branch2')
320
# Can't create a branch if it already exists
321
runbzr('branch branch1', retcode=1)
322
# Can't create a branch if its parent doesn't exist
323
runbzr('branch /unlikely/to/exist', retcode=1)
324
runbzr('branch branch1 branch2')
325
assert exists('branch2')
326
assert exists('branch2/sub1')
327
assert exists('branch2/sub1/hello.txt')
329
runbzr('branch --revision 0 branch1 branch3')
330
assert not exists('branch3/sub1/hello.txt')
331
runbzr('branch --revision 0..3 branch1 branch4', retcode=1)
335
runbzr('pull', retcode=1)
336
runbzr('pull ../branch2')
339
runbzr('commit --unchanged -m empty')
341
chdir('../../branch2')
343
runbzr('commit --unchanged -m empty')
345
runbzr('commit --unchanged -m empty')
346
runbzr('pull', retcode=1)
349
progress('status after remove')
350
mkdir('status-after-remove')
351
# see mail from William Dodé, 2005-05-25
352
# $ bzr init; touch a; bzr add a; bzr commit -m "add a"
353
# * looking for changes...
358
# bzr: local variable 'kind' referenced before assignment
359
# at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
360
# see ~/.bzr.log for debug information
361
chdir('status-after-remove')
363
file('a', 'w').write('foo')
365
runbzr(['commit', '-m', 'add a'])
373
progress("recursive and non-recursive add")
378
fp = os.path.join('foo', 'test.txt')
382
runbzr('add --no-recurse foo')
383
runbzr('file-id foo')
384
runbzr('file-id ' + fp, 1) # not versioned yet
385
runbzr('commit -m add-dir-only')
387
self.runbzr('file-id ' + fp, 1) # still not versioned
389
self.runbzr('add foo')
390
self.runbzr('file-id ' + fp)
391
self.runbzr('commit -m add-sub-file')
397
class RevertCommand(ExternalBase):
401
file('hello', 'wt').write('foo')
402
self.runbzr('add hello')
403
self.runbzr('commit -m setup hello')
405
file('hello', 'wt').write('bar')
406
self.runbzr('revert hello')
407
self.check_file_contents('hello', 'foo')
added
removed
bzrlib/selftest/blackbox.py
