/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
720 by Martin Pool
- start moving external tests into the testsuite framework
1
# Copyright (C) 2005 by Canonical Ltd
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
2
# -*- coding: utf-8 -*-
720 by Martin Pool
- start moving external tests into the testsuite framework
3
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
19
"""Black-box tests for bzr.
20
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface.
725 by Martin Pool
doc
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.
720 by Martin Pool
- start moving external tests into the testsuite framework
27
"""
28
1185.1.25 by Robert Collins
merge David Clymer's patch for TestCaseInTestDir.runcmd
29
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
import os
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
31
import sys
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
32
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
33
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
34
from bzrlib.branch import Branch
35
898 by Martin Pool
- add new runbzr method for external tests
36
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
37
class ExternalBase(TestCaseInTempDir):
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
38
1185.3.23 by Martin Pool
- run some previously external tests in process
39
    def runbzr(self, args, retcode=0, backtick=False):
898 by Martin Pool
- add new runbzr method for external tests
40
        if isinstance(args, basestring):
41
            args = args.split()
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
42
43
        if backtick:
1185.3.23 by Martin Pool
- run some previously external tests in process
44
            return self.run_bzr_captured(args, retcode=retcode)[0]
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
45
        else:
1185.3.23 by Martin Pool
- run some previously external tests in process
46
            return self.run_bzr_captured(args, retcode=retcode)
904 by Martin Pool
- more selftest external-command fixes
47
1142 by Martin Pool
- remove dead code from blackbox tests (pychecker)
48
1102 by Martin Pool
- merge test refactoring from robertc
49
class TestCommands(ExternalBase):
50
51
    def test_help_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
52
        self.runbzr('--help')
53
        self.runbzr('help')
54
        self.runbzr('help commands')
55
        self.runbzr('help help')
56
        self.runbzr('commit -h')
727 by Martin Pool
- move more code to run external commands from testbzr to selftest
57
1102 by Martin Pool
- merge test refactoring from robertc
58
    def test_init_branch(self):
898 by Martin Pool
- add new runbzr method for external tests
59
        self.runbzr(['init'])
732 by Martin Pool
- move more tests into bzr selftest
60
1102 by Martin Pool
- merge test refactoring from robertc
61
    def test_whoami(self):
732 by Martin Pool
- move more tests into bzr selftest
62
        # this should always identify something, if only "john@localhost"
898 by Martin Pool
- add new runbzr method for external tests
63
        self.runbzr("whoami")
64
        self.runbzr("whoami --email")
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
65
66
        self.assertEquals(self.runbzr("whoami --email",
67
                                      backtick=True).count('@'), 1)
68
        
1102 by Martin Pool
- merge test refactoring from robertc
69
    def test_whoami_branch(self):
70
        """branch specific user identity works."""
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
71
        self.runbzr('init')
72
        f = file('.bzr/email', 'wt')
73
        f.write('Branch Identity <branch@identi.ty>')
74
        f.close()
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
75
        bzr_email = os.environ.get('BZREMAIL')
76
        if bzr_email is not None:
77
            del os.environ['BZREMAIL']
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
78
        whoami = self.runbzr("whoami",backtick=True)
79
        whoami_email = self.runbzr("whoami --email",backtick=True)
80
        self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
81
        self.assertTrue(whoami_email.startswith('branch@identi.ty'))
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
82
        # Verify that the environment variable overrides the value 
83
        # in the file
84
        os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
85
        whoami = self.runbzr("whoami",backtick=True)
86
        whoami_email = self.runbzr("whoami --email",backtick=True)
87
        self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
88
        self.assertTrue(whoami_email.startswith('other@environ.ment'))
89
        if bzr_email is not None:
90
            os.environ['BZREMAIL'] = bzr_email
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
91
1102 by Martin Pool
- merge test refactoring from robertc
92
    def test_invalid_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
93
        self.runbzr("pants", retcode=1)
94
        self.runbzr("--pants off", retcode=1)
95
        self.runbzr("diff --message foo", retcode=1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
96
1102 by Martin Pool
- merge test refactoring from robertc
97
    def test_empty_commit(self):
898 by Martin Pool
- add new runbzr method for external tests
98
        self.runbzr("init")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
99
        self.build_tree(['hello.txt'])
898 by Martin Pool
- add new runbzr method for external tests
100
        self.runbzr("commit -m empty", retcode=1)
101
        self.runbzr("add hello.txt")
102
        self.runbzr("commit -m added")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
103
1102 by Martin Pool
- merge test refactoring from robertc
104
    def test_ignore_patterns(self):
906 by Martin Pool
- split out black-box ignore commands
105
        from bzrlib.branch import Branch
106
        
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
107
        b = Branch.initialize('.')
906 by Martin Pool
- split out black-box ignore commands
108
        self.assertEquals(list(b.unknowns()), [])
109
110
        file('foo.tmp', 'wt').write('tmp files are ignored')
111
        self.assertEquals(list(b.unknowns()), [])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
112
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
113
114
        file('foo.c', 'wt').write('int main() {}')
115
        self.assertEquals(list(b.unknowns()), ['foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
116
        assert self.capture('unknowns') == 'foo.c\n'
906 by Martin Pool
- split out black-box ignore commands
117
118
        self.runbzr(['add', 'foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
119
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
120
121
        # 'ignore' works when creating the .bzignore file
122
        file('foo.blah', 'wt').write('blah')
123
        self.assertEquals(list(b.unknowns()), ['foo.blah'])
124
        self.runbzr('ignore *.blah')
125
        self.assertEquals(list(b.unknowns()), [])
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
126
        assert file('.bzrignore', 'rU').read() == '*.blah\n'
906 by Martin Pool
- split out black-box ignore commands
127
128
        # 'ignore' works when then .bzrignore file already exists
129
        file('garh', 'wt').write('garh')
130
        self.assertEquals(list(b.unknowns()), ['garh'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
131
        assert self.capture('unknowns') == 'garh\n'
906 by Martin Pool
- split out black-box ignore commands
132
        self.runbzr('ignore garh')
133
        self.assertEquals(list(b.unknowns()), [])
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
134
        assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
1102 by Martin Pool
- merge test refactoring from robertc
135
136
    def test_revert(self):
137
        self.runbzr('init')
138
139
        file('hello', 'wt').write('foo')
140
        self.runbzr('add hello')
141
        self.runbzr('commit -m setup hello')
142
143
        file('goodbye', 'wt').write('baz')
144
        self.runbzr('add goodbye')
145
        self.runbzr('commit -m setup goodbye')
1092.1.14 by Robert Collins
relace runTest with test_foo in blackbox tests
146
        
1102 by Martin Pool
- merge test refactoring from robertc
147
        file('hello', 'wt').write('bar')
148
        file('goodbye', 'wt').write('qux')
149
        self.runbzr('revert hello')
150
        self.check_file_contents('hello', 'foo')
151
        self.check_file_contents('goodbye', 'qux')
152
        self.runbzr('revert')
153
        self.check_file_contents('goodbye', 'baz')
154
155
        os.mkdir('revertdir')
156
        self.runbzr('add revertdir')
157
        self.runbzr('commit -m f')
158
        os.rmdir('revertdir')
159
        self.runbzr('revert')
160
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
161
        file('hello', 'wt').write('xyz')
162
        self.runbzr('commit -m xyz hello')
163
        self.runbzr('revert -r 1 hello')
164
        self.check_file_contents('hello', 'foo')
165
        self.runbzr('revert hello')
166
        self.check_file_contents('hello', 'xyz')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
167
        os.chdir('revertdir')
168
        self.runbzr('revert')
169
        os.chdir('..')
170
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
171
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
172
    def test_mv_modes(self):
1102 by Martin Pool
- merge test refactoring from robertc
173
        """Test two modes of operation for mv"""
174
        from bzrlib.branch import Branch
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
175
        b = Branch.initialize('.')
1102 by Martin Pool
- merge test refactoring from robertc
176
        self.build_tree(['a', 'c', 'subdir/'])
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
177
        self.run_bzr_captured(['add', self.test_dir])
178
        self.run_bzr_captured(['mv', 'a', 'b'])
179
        self.run_bzr_captured(['mv', 'b', 'subdir'])
180
        self.run_bzr_captured(['mv', 'subdir/b', 'a'])
181
        self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
182
        self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
1102 by Martin Pool
- merge test refactoring from robertc
183
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
184
1102 by Martin Pool
- merge test refactoring from robertc
185
    def test_main_version(self):
186
        """Check output from version command and master option is reasonable"""
187
        # output is intentionally passed through to stdout so that we
188
        # can see the version being tested
189
        output = self.runbzr('version', backtick=1)
190
        self.log('bzr version output:')
191
        self.log(output)
192
        self.assert_(output.startswith('bzr (bazaar-ng) '))
193
        self.assertNotEqual(output.index('Canonical'), -1)
194
        # make sure --version is consistent
195
        tmp_output = self.runbzr('--version', backtick=1)
196
        self.log('bzr --version output:')
197
        self.log(tmp_output)
198
        self.assertEquals(output, tmp_output)
906 by Martin Pool
- split out black-box ignore commands
199
1092.1.39 by Robert Collins
merge from mpool
200
    def example_branch(test):
201
        test.runbzr('init')
202
        file('hello', 'wt').write('foo')
203
        test.runbzr('add hello')
204
        test.runbzr('commit -m setup hello')
205
        file('goodbye', 'wt').write('baz')
206
        test.runbzr('add goodbye')
207
        test.runbzr('commit -m setup goodbye')
208
1185.4.1 by Lalo Martins
blackbox tests for diff
209
    def test_diff(self):
210
        self.example_branch()
211
        file('hello', 'wt').write('hello world!')
212
        self.runbzr('commit -m fixing hello')
213
        output = self.runbzr('diff -r 2..3', backtick=1)
214
        self.assert_('\n+hello world!' in output)
215
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
216
        self.assert_('\n+baz' in output)
217
1185.8.4 by Aaron Bentley
Fixed branch -r
218
    def test_branch(self):
219
        """Branch from one branch to another."""
220
        os.mkdir('a')
221
        os.chdir('a')
222
        self.example_branch()
223
        os.chdir('..')
224
        self.runbzr('branch a b')
225
        self.runbzr('branch a c -r 1')
226
1092.1.39 by Robert Collins
merge from mpool
227
    def test_merge(self):
228
        from bzrlib.branch import Branch
1139 by Martin Pool
- merge in merge improvements and additional tests
229
        
1092.1.39 by Robert Collins
merge from mpool
230
        os.mkdir('a')
231
        os.chdir('a')
232
        self.example_branch()
233
        os.chdir('..')
234
        self.runbzr('branch a b')
235
        os.chdir('b')
236
        file('goodbye', 'wt').write('quux')
237
        self.runbzr(['commit',  '-m',  "more u's are always good"])
238
239
        os.chdir('../a')
240
        file('hello', 'wt').write('quuux')
241
        # We can't merge when there are in-tree changes
242
        self.runbzr('merge ../b', retcode=1)
243
        self.runbzr(['commit', '-m', "Like an epidemic of u's"])
244
        self.runbzr('merge ../b')
245
        self.check_file_contents('goodbye', 'quux')
246
        # Merging a branch pulls its revision into the tree
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
247
        a = Branch.open('.')
248
        b = Branch.open('../b')
1092.1.39 by Robert Collins
merge from mpool
249
        a.get_revision_xml(b.last_patch())
1139 by Martin Pool
- merge in merge improvements and additional tests
250
        self.log('pending merges: %s', a.pending_merges())
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
251
        #        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
252
        #        % (a.pending_merges(), b.last_patch())
253
974.1.71 by Aaron Bentley
Added test for pull
254
    def test_pull(self):
255
        """Pull changes from one branch to another."""
256
        os.mkdir('a')
257
        os.chdir('a')
258
259
        self.example_branch()
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
260
        self.runbzr('pull', retcode=1)
261
        self.runbzr('missing', retcode=1)
262
        self.runbzr('missing .')
263
        self.runbzr('missing')
264
        self.runbzr('pull')
265
        self.runbzr('pull /', retcode=1)
266
        self.runbzr('pull')
267
974.1.71 by Aaron Bentley
Added test for pull
268
        os.chdir('..')
269
        self.runbzr('branch a b')
270
        os.chdir('b')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
271
        self.runbzr('pull')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
272
        os.mkdir('subdir')
273
        self.runbzr('add subdir')
974.1.71 by Aaron Bentley
Added test for pull
274
        self.runbzr('commit -m blah --unchanged')
275
        os.chdir('../a')
1185.2.16 by Lalo Martins
fixing a few tests that came on the merge, for the new constructors
276
        a = Branch.open('.')
277
        b = Branch.open('../b')
974.1.71 by Aaron Bentley
Added test for pull
278
        assert a.revision_history() == b.revision_history()[:-1]
279
        self.runbzr('pull ../b')
280
        assert a.revision_history() == b.revision_history()
281
        self.runbzr('commit -m blah2 --unchanged')
282
        os.chdir('../b')
283
        self.runbzr('commit -m blah3 --unchanged')
284
        self.runbzr('pull ../a', retcode=1)
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
285
        os.chdir('../a')
286
        self.runbzr('merge ../b')
287
        self.runbzr('commit -m blah4 --unchanged')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
288
        os.chdir('../b/subdir')
289
        self.runbzr('pull ../../a')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
290
        assert a.revision_history()[-1] == b.revision_history()[-1]
291
        
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
292
    def test_add_reports(self):
293
        """add command prints the names of added files."""
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
294
        b = Branch.initialize('.')
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
295
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
296
        out = self.run_bzr_captured(['add'], retcode = 0)[0]
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
297
        # the ordering is not defined at the moment
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
298
        results = sorted(out.rstrip('\n').split('\n'))
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
299
        self.assertEquals(['added dir',
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
300
                           'added dir'+os.sep+'sub.txt',
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
301
                           'added top.txt',],
302
                          results)
303
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
304
    def test_unknown_command(self):
305
        """Handling of unknown command."""
306
        out, err = self.run_bzr_captured(['fluffy-badger'],
307
                                         retcode=1)
308
        self.assertEquals(out, '')
309
        err.index('unknown command')
310
        
311
1092.1.39 by Robert Collins
merge from mpool
312
904 by Martin Pool
- more selftest external-command fixes
313
class OldTests(ExternalBase):
1092.1.39 by Robert Collins
merge from mpool
314
    """old tests moved from ./testbzr."""
315
1102 by Martin Pool
- merge test refactoring from robertc
316
    def test_bzr(self):
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
317
        from os import chdir, mkdir
318
        from os.path import exists
319
904 by Martin Pool
- more selftest external-command fixes
320
        runbzr = self.runbzr
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
321
        capture = self.capture
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
322
        progress = self.log
323
324
        progress("basic branch creation")
904 by Martin Pool
- more selftest external-command fixes
325
        mkdir('branch1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
326
        chdir('branch1')
898 by Martin Pool
- add new runbzr method for external tests
327
        runbzr('init')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
328
1185.3.25 by Martin Pool
- run blackbox tests in-process
329
        self.assertEquals(capture('root').rstrip(),
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
330
                          os.path.join(self.test_dir, 'branch1'))
331
332
        progress("status of new file")
333
334
        f = file('test.txt', 'wt')
335
        f.write('hello world!\n')
336
        f.close()
337
1185.3.25 by Martin Pool
- run blackbox tests in-process
338
        self.assertEquals(capture('unknowns'), 'test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
339
1185.3.25 by Martin Pool
- run blackbox tests in-process
340
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
341
        assert out == 'unknown:\n  test.txt\n'
342
1185.3.25 by Martin Pool
- run blackbox tests in-process
343
        out = capture("status --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
344
        assert out == "unknown:\n  test.txt\n"
345
1185.3.25 by Martin Pool
- run blackbox tests in-process
346
        out = capture("status test.txt --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
347
        assert out == "unknown:\n  test.txt\n"
348
349
        f = file('test2.txt', 'wt')
350
        f.write('goodbye cruel world...\n')
351
        f.close()
352
1185.3.25 by Martin Pool
- run blackbox tests in-process
353
        out = capture("status test.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
354
        assert out == "unknown:\n  test.txt\n"
355
1185.3.25 by Martin Pool
- run blackbox tests in-process
356
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
357
        assert out == ("unknown:\n"
358
                       "  test.txt\n"
359
                       "  test2.txt\n")
360
361
        os.unlink('test2.txt')
362
363
        progress("command aliases")
1185.3.25 by Martin Pool
- run blackbox tests in-process
364
        out = capture("st --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
365
        assert out == ("unknown:\n"
366
                       "  test.txt\n")
367
1185.3.25 by Martin Pool
- run blackbox tests in-process
368
        out = capture("stat")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
369
        assert out == ("unknown:\n"
370
                       "  test.txt\n")
371
372
        progress("command help")
898 by Martin Pool
- add new runbzr method for external tests
373
        runbzr("help st")
374
        runbzr("help")
375
        runbzr("help commands")
376
        runbzr("help slartibartfast", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
377
1185.3.25 by Martin Pool
- run blackbox tests in-process
378
        out = capture("help ci")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
379
        out.index('aliases: ')
380
381
        progress("can't rename unversioned file")
898 by Martin Pool
- add new runbzr method for external tests
382
        runbzr("rename test.txt new-test.txt", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
383
384
        progress("adding a file")
385
898 by Martin Pool
- add new runbzr method for external tests
386
        runbzr("add test.txt")
1185.3.25 by Martin Pool
- run blackbox tests in-process
387
        assert capture("unknowns") == ''
388
        assert capture("status --all") == ("added:\n"
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
389
                                                "  test.txt\n")
390
391
        progress("rename newly-added file")
898 by Martin Pool
- add new runbzr method for external tests
392
        runbzr("rename test.txt hello.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
393
        assert os.path.exists("hello.txt")
394
        assert not os.path.exists("test.txt")
395
1185.3.25 by Martin Pool
- run blackbox tests in-process
396
        assert capture("revno") == '0\n'
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
397
398
        progress("add first revision")
904 by Martin Pool
- more selftest external-command fixes
399
        runbzr(['commit', '-m', 'add first revision'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
400
401
        progress("more complex renames")
402
        os.mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
403
        runbzr("rename hello.txt sub1", 1)
404
        runbzr("rename hello.txt sub1/hello.txt", 1)
405
        runbzr("move hello.txt sub1", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
406
898 by Martin Pool
- add new runbzr method for external tests
407
        runbzr("add sub1")
408
        runbzr("rename sub1 sub2")
409
        runbzr("move hello.txt sub2")
1185.3.25 by Martin Pool
- run blackbox tests in-process
410
        assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
411
412
        assert exists("sub2")
413
        assert exists("sub2/hello.txt")
414
        assert not exists("sub1")
415
        assert not exists("hello.txt")
416
898 by Martin Pool
- add new runbzr method for external tests
417
        runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
418
419
        mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
420
        runbzr('add sub1')
421
        runbzr('move sub2/hello.txt sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
422
        assert not exists('sub2/hello.txt')
423
        assert exists('sub1/hello.txt')
898 by Martin Pool
- add new runbzr method for external tests
424
        runbzr('move sub2 sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
425
        assert not exists('sub2')
426
        assert exists('sub1/sub2')
427
898 by Martin Pool
- add new runbzr method for external tests
428
        runbzr(['commit', '-m', 'rename nested subdirectories'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
429
430
        chdir('sub1/sub2')
1185.3.25 by Martin Pool
- run blackbox tests in-process
431
        self.assertEquals(capture('root')[:-1],
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
432
                          os.path.join(self.test_dir, 'branch1'))
898 by Martin Pool
- add new runbzr method for external tests
433
        runbzr('move ../hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
434
        assert exists('./hello.txt')
1185.3.25 by Martin Pool
- run blackbox tests in-process
435
        self.assertEquals(capture('relpath hello.txt'),
436
                          os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
437
        assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
898 by Martin Pool
- add new runbzr method for external tests
438
        runbzr(['commit', '-m', 'move to parent directory'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
439
        chdir('..')
1185.3.25 by Martin Pool
- run blackbox tests in-process
440
        assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
441
898 by Martin Pool
- add new runbzr method for external tests
442
        runbzr('move sub2/hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
443
        assert exists('hello.txt')
444
445
        f = file('hello.txt', 'wt')
446
        f.write('some nice new content\n')
447
        f.close()
448
449
        f = file('msg.tmp', 'wt')
450
        f.write('this is my new commit\n')
451
        f.close()
452
898 by Martin Pool
- add new runbzr method for external tests
453
        runbzr('commit -F msg.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
454
1185.3.25 by Martin Pool
- run blackbox tests in-process
455
        assert capture('revno') == '5\n'
898 by Martin Pool
- add new runbzr method for external tests
456
        runbzr('export -r 5 export-5.tmp')
457
        runbzr('export export.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
458
898 by Martin Pool
- add new runbzr method for external tests
459
        runbzr('log')
460
        runbzr('log -v')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
461
        runbzr('log -v --forward')
462
        runbzr('log -m', retcode=1)
1185.3.25 by Martin Pool
- run blackbox tests in-process
463
        log_out = capture('log -m commit')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
464
        assert "this is my new commit" in log_out
465
        assert "rename nested" not in log_out
466
        assert 'revision-id' not in log_out
1185.3.25 by Martin Pool
- run blackbox tests in-process
467
        assert 'revision-id' in capture('log --show-ids -m commit')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
468
469
470
        progress("file with spaces in name")
471
        mkdir('sub directory')
472
        file('sub directory/file with spaces ', 'wt').write('see how this works\n')
898 by Martin Pool
- add new runbzr method for external tests
473
        runbzr('add .')
474
        runbzr('diff')
475
        runbzr('commit -m add-spaces')
476
        runbzr('check')
477
478
        runbzr('log')
479
        runbzr('log --forward')
480
481
        runbzr('info')
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
482