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  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
30  | 
import sys  | 
| 
974.1.71
by Aaron Bentley
 Added test for pull  | 
31  | 
import os  | 
| 
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()), [])  | 
|
126  | 
assert file('.bzrignore', 'rb').read() == '*.blah\n'  | 
|
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()), [])  | 
|
134  | 
assert file('.bzrignore', 'rb').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')  | 
|
167  | 
||
| 
1185.1.8
by Robert Collins
 David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.  | 
168  | 
def test_mv_modes(self):  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
169  | 
"""Test two modes of operation for mv"""  | 
170  | 
from bzrlib.branch import Branch  | 
|
| 
1185.2.9
by Lalo Martins
 getting rid of everything that calls the Branch constructor directly  | 
171  | 
b = Branch.initialize('.')  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
172  | 
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  | 
173  | 
self.run_bzr_captured(['add', self.test_dir])  | 
174  | 
self.run_bzr_captured(['mv', 'a', 'b'])  | 
|
175  | 
self.run_bzr_captured(['mv', 'b', 'subdir'])  | 
|
176  | 
self.run_bzr_captured(['mv', 'subdir/b', 'a'])  | 
|
177  | 
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])  | 
|
178  | 
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])  | 
|
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
179  | 
|
| 
1185.1.8
by Robert Collins
 David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.  | 
180  | 
|
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
181  | 
def test_main_version(self):  | 
182  | 
"""Check output from version command and master option is reasonable"""  | 
|
183  | 
        # output is intentionally passed through to stdout so that we
 | 
|
184  | 
        # can see the version being tested
 | 
|
185  | 
output = self.runbzr('version', backtick=1)  | 
|
186  | 
self.log('bzr version output:')  | 
|
187  | 
self.log(output)  | 
|
188  | 
self.assert_(output.startswith('bzr (bazaar-ng) '))  | 
|
189  | 
self.assertNotEqual(output.index('Canonical'), -1)  | 
|
190  | 
        # make sure --version is consistent
 | 
|
191  | 
tmp_output = self.runbzr('--version', backtick=1)  | 
|
192  | 
self.log('bzr --version output:')  | 
|
193  | 
self.log(tmp_output)  | 
|
194  | 
self.assertEquals(output, tmp_output)  | 
|
| 
906
by Martin Pool
 - split out black-box ignore commands  | 
195  | 
|
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
196  | 
def example_branch(test):  | 
197  | 
test.runbzr('init')  | 
|
198  | 
file('hello', 'wt').write('foo')  | 
|
199  | 
test.runbzr('add hello')  | 
|
200  | 
test.runbzr('commit -m setup hello')  | 
|
201  | 
file('goodbye', 'wt').write('baz')  | 
|
202  | 
test.runbzr('add goodbye')  | 
|
203  | 
test.runbzr('commit -m setup goodbye')  | 
|
204  | 
||
| 
1185.4.1
by Lalo Martins
 blackbox tests for diff  | 
205  | 
def test_diff(self):  | 
206  | 
self.example_branch()  | 
|
207  | 
file('hello', 'wt').write('hello world!')  | 
|
208  | 
self.runbzr('commit -m fixing hello')  | 
|
209  | 
output = self.runbzr('diff -r 2..3', backtick=1)  | 
|
210  | 
self.assert_('\n+hello world!' in output)  | 
|
211  | 
output = self.runbzr('diff -r last:3..last:1', backtick=1)  | 
|
212  | 
self.assert_('\n+baz' in output)  | 
|
213  | 
||
| 
1185.1.27
by Robert Collins
 merge in John Meinels integration branch  | 
214  | 
def test_diff(self):  | 
215  | 
self.example_branch()  | 
|
216  | 
file('hello', 'wt').write('hello world!')  | 
|
217  | 
self.runbzr('commit -m fixing hello')  | 
|
218  | 
output = self.runbzr('diff -r 2..3', backtick=1)  | 
|
219  | 
self.assert_('\n+hello world!' in output)  | 
|
220  | 
output = self.runbzr('diff -r last:3..last:1', backtick=1)  | 
|
221  | 
self.assert_('\n+baz' in output)  | 
|
222  | 
||
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
223  | 
def test_merge(self):  | 
224  | 
from bzrlib.branch import Branch  | 
|
| 
1139
by Martin Pool
 - merge in merge improvements and additional tests  | 
225  | 
|
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
226  | 
os.mkdir('a')  | 
227  | 
os.chdir('a')  | 
|
228  | 
self.example_branch()  | 
|
229  | 
os.chdir('..')  | 
|
230  | 
self.runbzr('branch a b')  | 
|
231  | 
os.chdir('b')  | 
|
232  | 
file('goodbye', 'wt').write('quux')  | 
|
233  | 
self.runbzr(['commit', '-m', "more u's are always good"])  | 
|
234  | 
||
235  | 
os.chdir('../a')  | 
|
236  | 
file('hello', 'wt').write('quuux')  | 
|
237  | 
        # We can't merge when there are in-tree changes
 | 
|
238  | 
self.runbzr('merge ../b', retcode=1)  | 
|
239  | 
self.runbzr(['commit', '-m', "Like an epidemic of u's"])  | 
|
240  | 
self.runbzr('merge ../b')  | 
|
241  | 
self.check_file_contents('goodbye', 'quux')  | 
|
242  | 
        # 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  | 
243  | 
a = Branch.open('.')  | 
244  | 
b = Branch.open('../b')  | 
|
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
245  | 
a.get_revision_xml(b.last_patch())  | 
| 
1139
by Martin Pool
 - merge in merge improvements and additional tests  | 
246  | 
self.log('pending merges: %s', a.pending_merges())  | 
| 
1161
by Martin Pool
 - add test that 'bzr add' reports the files as they're added  | 
247  | 
        #        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
 | 
248  | 
        #        % (a.pending_merges(), b.last_patch())
 | 
|
249  | 
||
| 
974.1.71
by Aaron Bentley
 Added test for pull  | 
250  | 
def test_pull(self):  | 
251  | 
"""Pull changes from one branch to another."""  | 
|
252  | 
os.mkdir('a')  | 
|
253  | 
os.chdir('a')  | 
|
254  | 
||
255  | 
self.example_branch()  | 
|
| 
974.1.79
by Aaron Bentley
 Fixed issues with pull not having a default location after branch  | 
256  | 
self.runbzr('pull', retcode=1)  | 
257  | 
self.runbzr('missing', retcode=1)  | 
|
258  | 
self.runbzr('missing .')  | 
|
259  | 
self.runbzr('missing')  | 
|
260  | 
self.runbzr('pull')  | 
|
261  | 
self.runbzr('pull /', retcode=1)  | 
|
262  | 
self.runbzr('pull')  | 
|
263  | 
||
| 
974.1.71
by Aaron Bentley
 Added test for pull  | 
264  | 
os.chdir('..')  | 
265  | 
self.runbzr('branch a b')  | 
|
266  | 
os.chdir('b')  | 
|
| 
974.1.79
by Aaron Bentley
 Fixed issues with pull not having a default location after branch  | 
267  | 
self.runbzr('pull')  | 
| 
974.1.71
by Aaron Bentley
 Added test for pull  | 
268  | 
self.runbzr('commit -m blah --unchanged')  | 
269  | 
os.chdir('../a')  | 
|
| 
1185.2.16
by Lalo Martins
 fixing a few tests that came on the merge, for the new constructors  | 
270  | 
a = Branch.open('.')  | 
271  | 
b = Branch.open('../b')  | 
|
| 
974.1.71
by Aaron Bentley
 Added test for pull  | 
272  | 
assert a.revision_history() == b.revision_history()[:-1]  | 
273  | 
self.runbzr('pull ../b')  | 
|
274  | 
assert a.revision_history() == b.revision_history()  | 
|
275  | 
self.runbzr('commit -m blah2 --unchanged')  | 
|
276  | 
os.chdir('../b')  | 
|
277  | 
self.runbzr('commit -m blah3 --unchanged')  | 
|
278  | 
self.runbzr('pull ../a', retcode=1)  | 
|
| 
974.1.74
by Aaron Bentley
 Made pull work after remote branch has merged latest revision  | 
279  | 
os.chdir('../a')  | 
280  | 
self.runbzr('merge ../b')  | 
|
281  | 
self.runbzr('commit -m blah4 --unchanged')  | 
|
282  | 
os.chdir('../b')  | 
|
283  | 
self.runbzr('pull ../a')  | 
|
284  | 
assert a.revision_history()[-1] == b.revision_history()[-1]  | 
|
285  | 
||
| 
1161
by Martin Pool
 - add test that 'bzr add' reports the files as they're added  | 
286  | 
def test_add_reports(self):  | 
287  | 
"""add command prints the names of added files."""  | 
|
| 
1185.2.9
by Lalo Martins
 getting rid of everything that calls the Branch constructor directly  | 
288  | 
b = Branch.initialize('.')  | 
| 
1161
by Martin Pool
 - add test that 'bzr add' reports the files as they're added  | 
289  | 
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  | 
290  | 
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  | 
291  | 
        # 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  | 
292  | 
results = sorted(out.rstrip('\n').split('\n'))  | 
| 
1161
by Martin Pool
 - add test that 'bzr add' reports the files as they're added  | 
293  | 
self.assertEquals(['added dir',  | 
294  | 
'added dir/sub.txt',  | 
|
295  | 
'added top.txt',],  | 
|
296  | 
results)  | 
|
297  | 
||
| 
1185.3.20
by Martin Pool
 - run_bzr_captured also includes logged errors in  | 
298  | 
def test_unknown_command(self):  | 
299  | 
"""Handling of unknown command."""  | 
|
300  | 
out, err = self.run_bzr_captured(['fluffy-badger'],  | 
|
301  | 
retcode=1)  | 
|
302  | 
self.assertEquals(out, '')  | 
|
303  | 
err.index('unknown command')  | 
|
304  | 
||
305  | 
||
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
306  | 
|
| 
904
by Martin Pool
 - more selftest external-command fixes  | 
307  | 
class OldTests(ExternalBase):  | 
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
308  | 
"""old tests moved from ./testbzr."""  | 
309  | 
||
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
310  | 
def test_bzr(self):  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
311  | 
from os import chdir, mkdir  | 
312  | 
from os.path import exists  | 
|
313  | 
||
| 
904
by Martin Pool
 - more selftest external-command fixes  | 
314  | 
runbzr = self.runbzr  | 
| 
1185.3.26
by Martin Pool
 - remove remaining external executions of bzr  | 
315  | 
capture = self.capture  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
316  | 
progress = self.log  | 
317  | 
||
318  | 
progress("basic branch creation")  | 
|
| 
904
by Martin Pool
 - more selftest external-command fixes  | 
319  | 
mkdir('branch1')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
320  | 
chdir('branch1')  | 
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
321  | 
runbzr('init')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
322  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
323  | 
self.assertEquals(capture('root').rstrip(),  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
324  | 
os.path.join(self.test_dir, 'branch1'))  | 
325  | 
||
326  | 
progress("status of new file")  | 
|
327  | 
||
328  | 
f = file('test.txt', 'wt')  | 
|
329  | 
f.write('hello world!\n')  | 
|
330  | 
f.close()  | 
|
331  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
332  | 
self.assertEquals(capture('unknowns'), 'test.txt\n')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
333  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
334  | 
out = capture("status")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
335  | 
assert out == 'unknown:\n test.txt\n'  | 
336  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
337  | 
out = capture("status --all")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
338  | 
assert out == "unknown:\n test.txt\n"  | 
339  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
340  | 
out = capture("status test.txt --all")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
341  | 
assert out == "unknown:\n test.txt\n"  | 
342  | 
||
343  | 
f = file('test2.txt', 'wt')  | 
|
344  | 
f.write('goodbye cruel world...\n')  | 
|
345  | 
f.close()  | 
|
346  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
347  | 
out = capture("status test.txt")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
348  | 
assert out == "unknown:\n test.txt\n"  | 
349  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
350  | 
out = capture("status")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
351  | 
assert out == ("unknown:\n"  | 
352  | 
" test.txt\n"  | 
|
353  | 
" test2.txt\n")  | 
|
354  | 
||
355  | 
os.unlink('test2.txt')  | 
|
356  | 
||
357  | 
progress("command aliases")  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
358  | 
out = capture("st --all")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
359  | 
assert out == ("unknown:\n"  | 
360  | 
" test.txt\n")  | 
|
361  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
362  | 
out = capture("stat")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
363  | 
assert out == ("unknown:\n"  | 
364  | 
" test.txt\n")  | 
|
365  | 
||
366  | 
progress("command help")  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
367  | 
runbzr("help st")  | 
368  | 
runbzr("help")  | 
|
369  | 
runbzr("help commands")  | 
|
370  | 
runbzr("help slartibartfast", 1)  | 
|
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
371  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
372  | 
out = capture("help ci")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
373  | 
out.index('aliases: ')  | 
374  | 
||
375  | 
progress("can't rename unversioned file")  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
376  | 
runbzr("rename test.txt new-test.txt", 1)  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
377  | 
|
378  | 
progress("adding a file")  | 
|
379  | 
||
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
380  | 
runbzr("add test.txt")  | 
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
381  | 
assert capture("unknowns") == ''  | 
382  | 
assert capture("status --all") == ("added:\n"  | 
|
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
383  | 
" test.txt\n")  | 
384  | 
||
385  | 
progress("rename newly-added file")  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
386  | 
runbzr("rename test.txt hello.txt")  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
387  | 
assert os.path.exists("hello.txt")  | 
388  | 
assert not os.path.exists("test.txt")  | 
|
389  | 
||
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
390  | 
assert capture("revno") == '0\n'  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
391  | 
|
392  | 
progress("add first revision")  | 
|
| 
904
by Martin Pool
 - more selftest external-command fixes  | 
393  | 
runbzr(['commit', '-m', 'add first revision'])  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
394  | 
|
395  | 
progress("more complex renames")  | 
|
396  | 
os.mkdir("sub1")  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
397  | 
runbzr("rename hello.txt sub1", 1)  | 
398  | 
runbzr("rename hello.txt sub1/hello.txt", 1)  | 
|
399  | 
runbzr("move hello.txt sub1", 1)  | 
|
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
400  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
401  | 
runbzr("add sub1")  | 
402  | 
runbzr("rename sub1 sub2")  | 
|
403  | 
runbzr("move hello.txt sub2")  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
404  | 
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  | 
405  | 
|
406  | 
assert exists("sub2")  | 
|
407  | 
assert exists("sub2/hello.txt")  | 
|
408  | 
assert not exists("sub1")  | 
|
409  | 
assert not exists("hello.txt")  | 
|
410  | 
||
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
411  | 
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
412  | 
|
413  | 
mkdir("sub1")  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
414  | 
runbzr('add sub1')  | 
415  | 
runbzr('move sub2/hello.txt sub1')  | 
|
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
416  | 
assert not exists('sub2/hello.txt')  | 
417  | 
assert exists('sub1/hello.txt')  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
418  | 
runbzr('move sub2 sub1')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
419  | 
assert not exists('sub2')  | 
420  | 
assert exists('sub1/sub2')  | 
|
421  | 
||
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
422  | 
runbzr(['commit', '-m', 'rename nested subdirectories'])  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
423  | 
|
424  | 
chdir('sub1/sub2')  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
425  | 
self.assertEquals(capture('root')[:-1],  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
426  | 
os.path.join(self.test_dir, 'branch1'))  | 
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
427  | 
runbzr('move ../hello.txt .')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
428  | 
assert exists('./hello.txt')  | 
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
429  | 
self.assertEquals(capture('relpath hello.txt'),  | 
430  | 
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')  | 
|
431  | 
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  | 
432  | 
runbzr(['commit', '-m', 'move to parent directory'])  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
433  | 
chdir('..')  | 
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
434  | 
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  | 
435  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
436  | 
runbzr('move sub2/hello.txt .')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
437  | 
assert exists('hello.txt')  | 
438  | 
||
439  | 
f = file('hello.txt', 'wt')  | 
|
440  | 
f.write('some nice new content\n')  | 
|
441  | 
f.close()  | 
|
442  | 
||
443  | 
f = file('msg.tmp', 'wt')  | 
|
444  | 
f.write('this is my new commit\n')  | 
|
445  | 
f.close()  | 
|
446  | 
||
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
447  | 
runbzr('commit -F msg.tmp')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
448  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
449  | 
assert capture('revno') == '5\n'  | 
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
450  | 
runbzr('export -r 5 export-5.tmp')  | 
451  | 
runbzr('export export.tmp')  | 
|
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
452  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
453  | 
runbzr('log')  | 
454  | 
runbzr('log -v')  | 
|
| 
909.1.5
by Aaron Bentley
 Fixed log -v (mostly)  | 
455  | 
runbzr('log -v --forward')  | 
456  | 
runbzr('log -m', retcode=1)  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
457  | 
log_out = capture('log -m commit')  | 
| 
909.1.5
by Aaron Bentley
 Fixed log -v (mostly)  | 
458  | 
assert "this is my new commit" in log_out  | 
459  | 
assert "rename nested" not in log_out  | 
|
460  | 
assert 'revision-id' not in log_out  | 
|
| 
1185.3.25
by Martin Pool
 - run blackbox tests in-process  | 
461  | 
assert 'revision-id' in capture('log --show-ids -m commit')  | 
| 
736
by Martin Pool
 - move old blackbox code from testbzr into bzrlib.selftest.blackbox  | 
462  | 
|
463  | 
||
464  | 
progress("file with spaces in name")  | 
|
465  | 
mkdir('sub directory')  | 
|
466  | 
file('sub directory/file with spaces ', 'wt').write('see how this works\n')  | 
|
| 
898
by Martin Pool
 - add new runbzr method for external tests  | 
467  | 
runbzr('add .')  | 
468  | 
runbzr('diff')  | 
|
469  | 
runbzr('commit -m add-spaces')  | 
|
470  | 
runbzr('check')  | 
|
471  | 
||
472  | 
runbzr('log')  | 
|
473  | 
runbzr('log --forward')  | 
|
474  | 
||
475  | 
runbzr('info')  | 
|
| 
1092.1.35
by Robert Collins
 merge from mpool up to rev 1110  | 
476  |