44
42
if isinstance(args, basestring):
45
43
args = args.split()
47
return self.runcmd(['python', self.BZRPATH,] + args,
52
class MvCommand(BzrTestBase):
54
"""Test two modes of operation for mv"""
55
b = Branch('.', init=True)
56
self.build_tree(['a', 'c', 'subdir/'])
57
self.run_bzr('mv', 'a', 'b')
58
self.run_bzr('mv', 'b', 'subdir')
59
self.run_bzr('mv', 'subdir/b', 'a')
60
self.run_bzr('mv', 'a', 'b', 'subdir')
61
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
65
class TestVersion(BzrTestBase):
66
"""Check output from version command and master option is reasonable"""
68
# output is intentionally passed through to stdout so that we
69
# can see the version being tested
70
from cStringIO import StringIO
73
sys.stdout = tmp_out = StringIO()
75
self.run_bzr('version')
79
output = tmp_out.getvalue()
80
self.log('bzr version output:')
83
self.assert_(output.startswith('bzr (bazaar-ng) '))
84
self.assertNotEqual(output.index('Canonical'), -1)
86
# make sure --version is consistent
88
sys.stdout = tmp_out = StringIO()
90
self.run_bzr('--version')
94
self.log('bzr --version output:')
95
self.log(tmp_out.getvalue())
97
self.assertEquals(output, tmp_out.getvalue())
103
class HelpCommands(ExternalBase):
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):
105
55
self.runbzr('--help')
106
56
self.runbzr('help')
107
57
self.runbzr('help commands')
108
58
self.runbzr('help help')
109
59
self.runbzr('commit -h')
112
class InitBranch(ExternalBase):
61
def test_init_branch(self):
115
63
self.runbzr(['init'])
119
class UserIdentity(ExternalBase):
65
def test_whoami(self):
121
66
# this should always identify something, if only "john@localhost"
122
67
self.runbzr("whoami")
123
68
self.runbzr("whoami --email")
124
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
128
class InvalidCommands(ExternalBase):
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):
130
85
self.runbzr("pants", retcode=1)
131
86
self.runbzr("--pants off", retcode=1)
132
87
self.runbzr("diff --message foo", retcode=1)
136
class EmptyCommit(ExternalBase):
89
def test_empty_commit(self):
138
90
self.runbzr("init")
139
91
self.build_tree(['hello.txt'])
140
92
self.runbzr("commit -m empty", retcode=1)
141
93
self.runbzr("add hello.txt")
142
94
self.runbzr("commit -m added")
146
class IgnorePatterns(ExternalBase):
96
def test_ignore_patterns(self):
148
97
from bzrlib.branch import Branch
150
99
b = Branch('.', init=True)
175
124
self.runbzr('ignore garh')
176
125
self.assertEquals(list(b.unknowns()), [])
177
126
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())
182
230
class OldTests(ExternalBase):
183
# old tests moved from ./testbzr
231
"""old tests moved from ./testbzr."""
185
234
from os import chdir, mkdir
186
235
from os.path import exists
added
removed
bzrlib/selftest/blackbox.py
