31
from bzrlib.selftest import TestBase, InTempDir, BzrTestBase
35
class ExternalBase(InTempDir):
36
def runbzr(self, args, retcode=0):
39
from subprocess import call
40
except ImportError, e:
31
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
32
from bzrlib.branch import Branch
33
from bzrlib.commands import run_bzr
36
class ExternalBase(TestCaseInTempDir):
37
def runbzr(self, args, retcode=0,backtick=False):
44
38
if isinstance(args, basestring):
45
39
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):
42
return self.backtick(['python', self.BZRPATH,] + args,
45
return self.runcmd(['python', self.BZRPATH,] + args,
49
class TestCommands(ExternalBase):
51
def test_help_commands(self):
105
52
self.runbzr('--help')
106
53
self.runbzr('help')
107
54
self.runbzr('help commands')
108
55
self.runbzr('help help')
109
56
self.runbzr('commit -h')
112
class InitBranch(ExternalBase):
58
def test_init_branch(self):
115
59
self.runbzr(['init'])
119
class UserIdentity(ExternalBase):
61
def test_whoami(self):
121
62
# this should always identify something, if only "john@localhost"
122
63
self.runbzr("whoami")
123
64
self.runbzr("whoami --email")
124
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
128
class InvalidCommands(ExternalBase):
66
self.assertEquals(self.runbzr("whoami --email",
67
backtick=True).count('@'), 1)
69
def test_whoami_branch(self):
70
"""branch specific user identity works."""
72
f = file('.bzr/email', 'wt')
73
f.write('Branch Identity <branch@identi.ty>')
75
whoami = self.runbzr("whoami",backtick=True)
76
whoami_email = self.runbzr("whoami --email",backtick=True)
77
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
78
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
80
def test_invalid_commands(self):
130
81
self.runbzr("pants", retcode=1)
131
82
self.runbzr("--pants off", retcode=1)
132
83
self.runbzr("diff --message foo", retcode=1)
136
class EmptyCommit(ExternalBase):
85
def test_empty_commit(self):
138
86
self.runbzr("init")
139
87
self.build_tree(['hello.txt'])
140
88
self.runbzr("commit -m empty", retcode=1)
141
89
self.runbzr("add hello.txt")
142
90
self.runbzr("commit -m added")
146
class IgnorePatterns(ExternalBase):
92
def test_ignore_patterns(self):
148
93
from bzrlib.branch import Branch
150
95
b = Branch('.', init=True)
175
120
self.runbzr('ignore garh')
176
121
self.assertEquals(list(b.unknowns()), [])
177
122
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
124
def test_revert(self):
128
file('hello', 'wt').write('foo')
129
self.runbzr('add hello')
130
self.runbzr('commit -m setup hello')
132
file('goodbye', 'wt').write('baz')
133
self.runbzr('add goodbye')
134
self.runbzr('commit -m setup goodbye')
136
file('hello', 'wt').write('bar')
137
file('goodbye', 'wt').write('qux')
138
self.runbzr('revert hello')
139
self.check_file_contents('hello', 'foo')
140
self.check_file_contents('goodbye', 'qux')
141
self.runbzr('revert')
142
self.check_file_contents('goodbye', 'baz')
144
os.mkdir('revertdir')
145
self.runbzr('add revertdir')
146
self.runbzr('commit -m f')
147
os.rmdir('revertdir')
148
self.runbzr('revert')
150
def test_mv_modes(self):
151
"""Test two modes of operation for mv"""
152
from bzrlib.branch import Branch
153
b = Branch('.', init=True)
154
self.build_tree(['a', 'c', 'subdir/'])
155
self.run_bzr('add', self.test_dir)
156
self.run_bzr('mv', 'a', 'b')
157
self.run_bzr('mv', 'b', 'subdir')
158
self.run_bzr('mv', 'subdir/b', 'a')
159
self.run_bzr('mv', 'a', 'c', 'subdir')
160
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
163
def test_main_version(self):
164
"""Check output from version command and master option is reasonable"""
165
# output is intentionally passed through to stdout so that we
166
# can see the version being tested
167
output = self.runbzr('version', backtick=1)
168
self.log('bzr version output:')
170
self.assert_(output.startswith('bzr (bazaar-ng) '))
171
self.assertNotEqual(output.index('Canonical'), -1)
172
# make sure --version is consistent
173
tmp_output = self.runbzr('--version', backtick=1)
174
self.log('bzr --version output:')
176
self.assertEquals(output, tmp_output)
178
def example_branch(test):
180
file('hello', 'wt').write('foo')
181
test.runbzr('add hello')
182
test.runbzr('commit -m setup hello')
183
file('goodbye', 'wt').write('baz')
184
test.runbzr('add goodbye')
185
test.runbzr('commit -m setup goodbye')
187
def test_revert(self):
188
self.example_branch()
189
file('hello', 'wt').write('bar')
190
file('goodbye', 'wt').write('qux')
191
self.runbzr('revert hello')
192
self.check_file_contents('hello', 'foo')
193
self.check_file_contents('goodbye', 'qux')
194
self.runbzr('revert')
195
self.check_file_contents('goodbye', 'baz')
197
def test_merge(self):
198
from bzrlib.branch import Branch
204
self.example_branch()
206
self.runbzr('branch a b')
208
file('goodbye', 'wt').write('quux')
209
self.runbzr(['commit', '-m', "more u's are always good"])
212
file('hello', 'wt').write('quuux')
213
# We can't merge when there are in-tree changes
214
self.runbzr('merge ../b', retcode=1)
215
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
216
self.runbzr('merge ../b')
217
self.check_file_contents('goodbye', 'quux')
218
# Merging a branch pulls its revision into the tree
221
a.get_revision_xml(b.last_patch())
223
self.log('pending merges: %s', a.pending_merges())
224
# assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
225
# % (a.pending_merges(), b.last_patch())
228
def test_add_reports(self):
229
"""add command prints the names of added files."""
230
b = Branch('.', init=True)
231
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
233
from cStringIO import StringIO
236
ret = self.apply_redirected(None, out, None,
239
self.assertEquals(ret, 0)
241
# the ordering is not defined at the moment
242
results = sorted(out.getvalue().rstrip('\n').split('\n'))
243
self.assertEquals(['added dir',
182
249
class OldTests(ExternalBase):
183
# old tests moved from ./testbzr
250
"""old tests moved from ./testbzr."""
185
253
from os import chdir, mkdir
186
254
from os.path import exists
added
removed
bzrlib/selftest/blackbox.py
