bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
1  | 
# Copyright (C) 2009 Canonical Ltd
 | 
2  | 
#
 | 
|
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
|
| 
4665.5.20
by Vincent Ladeuil
 Fixed as per Martin's review.  | 
16  | 
|
| 
4665.5.9
by Vincent Ladeuil
 Start adding doc.  | 
17  | 
"""Shell-like test scripts.
 | 
18  | 
||
| 
4665.5.21
by Vincent Ladeuil
 Fix some typos mentioned by Martin.  | 
19  | 
See developers/testing.html for more explanations.
 | 
| 
4665.5.9
by Vincent Ladeuil
 Start adding doc.  | 
20  | 
"""
 | 
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
21  | 
|
| 
4665.5.12
by Vincent Ladeuil
 Support '...' in expected strings.  | 
22  | 
import doctest  | 
| 
4665.5.17
by Vincent Ladeuil
 Implement 'rm' command.  | 
23  | 
import errno  | 
| 
4665.5.19
by Vincent Ladeuil
 Implement globbing and enhance cat to accept multiple files.  | 
24  | 
import glob  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
25  | 
import os  | 
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
26  | 
import shlex  | 
| 
4665.5.12
by Vincent Ladeuil
 Support '...' in expected strings.  | 
27  | 
from cStringIO import StringIO  | 
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
28  | 
|
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
29  | 
from bzrlib import (  | 
30  | 
osutils,  | 
|
31  | 
tests,  | 
|
32  | 
    )
 | 
|
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
33  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
34  | 
|
| 
4665.5.2
by Vincent Ladeuil
 Handle simple, double and back quotes.  | 
35  | 
def split(s):  | 
36  | 
"""Split a command line respecting quotes."""  | 
|
37  | 
scanner = shlex.shlex(s)  | 
|
38  | 
scanner.quotes = '\'"`'  | 
|
39  | 
scanner.whitespace_split = True  | 
|
40  | 
for t in list(scanner):  | 
|
| 
4665.5.19
by Vincent Ladeuil
 Implement globbing and enhance cat to accept multiple files.  | 
41  | 
yield t  | 
| 
4665.5.2
by Vincent Ladeuil
 Handle simple, double and back quotes.  | 
42  | 
|
43  | 
||
44  | 
def _script_to_commands(text, file_name=None):  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
45  | 
"""Turn a script into a list of commands with their associated IOs.  | 
46  | 
||
| 
4665.5.21
by Vincent Ladeuil
 Fix some typos mentioned by Martin.  | 
47  | 
    Each command appears on a line by itself starting with '$ '. It can be
 | 
48  | 
    associated with an input that will feed it and an expected output.
 | 
|
49  | 
||
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
50  | 
    Comments starts with '#' until the end of line.
 | 
51  | 
    Empty lines are ignored.
 | 
|
| 
4665.5.21
by Vincent Ladeuil
 Fix some typos mentioned by Martin.  | 
52  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
53  | 
    Input and output are full lines terminated by a '\n'.
 | 
| 
4665.5.21
by Vincent Ladeuil
 Fix some typos mentioned by Martin.  | 
54  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
55  | 
    Input lines start with '<'.
 | 
| 
4665.5.21
by Vincent Ladeuil
 Fix some typos mentioned by Martin.  | 
56  | 
    Output lines start with nothing.
 | 
| 
4665.5.3
by Vincent Ladeuil
 Separate error from normal output.  | 
57  | 
    Error lines start with '2>'.
 | 
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
58  | 
    """
 | 
| 
4665.5.7
by Vincent Ladeuil
 Simplify output/errors handling.  | 
59  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
60  | 
commands = []  | 
| 
4665.5.7
by Vincent Ladeuil
 Simplify output/errors handling.  | 
61  | 
|
62  | 
def add_command(cmd, input, output, error):  | 
|
63  | 
if cmd is not None:  | 
|
64  | 
if input is not None:  | 
|
65  | 
input = ''.join(input)  | 
|
66  | 
if output is not None:  | 
|
67  | 
output = ''.join(output)  | 
|
68  | 
if error is not None:  | 
|
69  | 
error = ''.join(error)  | 
|
70  | 
commands.append((cmd, input, output, error))  | 
|
71  | 
||
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
72  | 
cmd_cur = None  | 
73  | 
cmd_line = 1  | 
|
74  | 
lineno = 0  | 
|
| 
4665.5.3
by Vincent Ladeuil
 Separate error from normal output.  | 
75  | 
input, output, error = None, None, None  | 
| 
4665.5.2
by Vincent Ladeuil
 Handle simple, double and back quotes.  | 
76  | 
for line in text.split('\n'):  | 
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
77  | 
lineno += 1  | 
78  | 
        # Keep a copy for error reporting
 | 
|
79  | 
orig = line  | 
|
80  | 
comment = line.find('#')  | 
|
81  | 
if comment >= 0:  | 
|
82  | 
            # Delete comments
 | 
|
83  | 
line = line[0:comment]  | 
|
84  | 
line = line.rstrip()  | 
|
85  | 
if line == '':  | 
|
86  | 
            # Ignore empty lines
 | 
|
87  | 
            continue
 | 
|
| 
4665.5.20
by Vincent Ladeuil
 Fixed as per Martin's review.  | 
88  | 
if line.startswith('$'):  | 
89  | 
            # Time to output the current command
 | 
|
90  | 
add_command(cmd_cur, input, output, error)  | 
|
91  | 
            # And start a new one
 | 
|
92  | 
cmd_cur = list(split(line[1:]))  | 
|
93  | 
cmd_line = lineno  | 
|
94  | 
input, output, error = None, None, None  | 
|
95  | 
elif line.startswith('<'):  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
96  | 
if input is None:  | 
97  | 
if cmd_cur is None:  | 
|
98  | 
raise SyntaxError('No command for that input',  | 
|
99  | 
(file_name, lineno, 1, orig))  | 
|
100  | 
input = []  | 
|
101  | 
input.append(line[1:] + '\n')  | 
|
| 
4665.5.3
by Vincent Ladeuil
 Separate error from normal output.  | 
102  | 
elif line.startswith('2>'):  | 
103  | 
if error is None:  | 
|
104  | 
if cmd_cur is None:  | 
|
105  | 
raise SyntaxError('No command for that error',  | 
|
106  | 
(file_name, lineno, 1, orig))  | 
|
107  | 
error = []  | 
|
108  | 
error.append(line[2:] + '\n')  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
109  | 
else:  | 
| 
4665.5.20
by Vincent Ladeuil
 Fixed as per Martin's review.  | 
110  | 
if output is None:  | 
111  | 
if cmd_cur is None:  | 
|
112  | 
raise SyntaxError('No command for that output',  | 
|
113  | 
(file_name, lineno, 1, orig))  | 
|
114  | 
output = []  | 
|
115  | 
output.append(line + '\n')  | 
|
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
116  | 
    # Add the last seen command
 | 
| 
4665.5.7
by Vincent Ladeuil
 Simplify output/errors handling.  | 
117  | 
add_command(cmd_cur, input, output, error)  | 
| 
4665.5.1
by Vincent Ladeuil
 Start some shell-like capability to write tests.  | 
118  | 
return commands  | 
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
119  | 
|
120  | 
||
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
121  | 
def _scan_redirection_options(args):  | 
122  | 
"""Recognize and process input and output redirections.  | 
|
123  | 
||
124  | 
    :param args: The command line arguments
 | 
|
125  | 
||
126  | 
    :return: A tuple containing: 
 | 
|
127  | 
        - The file name redirected from or None
 | 
|
128  | 
        - The file name redirected to or None
 | 
|
129  | 
        - The mode to open the output file or None
 | 
|
130  | 
        - The reamining arguments
 | 
|
131  | 
    """
 | 
|
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
132  | 
def redirected_file_name(direction, name, args):  | 
133  | 
if name == '':  | 
|
134  | 
try:  | 
|
135  | 
name = args.pop(0)  | 
|
136  | 
except IndexError:  | 
|
137  | 
                # We leave the error handling to higher levels, an empty name
 | 
|
138  | 
                # can't be legal.
 | 
|
139  | 
name = ''  | 
|
140  | 
return name  | 
|
141  | 
||
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
142  | 
remaining = []  | 
143  | 
in_name = None  | 
|
144  | 
out_name, out_mode = None, None  | 
|
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
145  | 
while args:  | 
146  | 
arg = args.pop(0)  | 
|
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
147  | 
if arg.startswith('<'):  | 
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
148  | 
in_name = redirected_file_name('<', arg[1:], args)  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
149  | 
elif arg.startswith('>>'):  | 
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
150  | 
out_name = redirected_file_name('>>', arg[2:], args)  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
151  | 
out_mode = 'ab+'  | 
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
152  | 
elif arg.startswith('>',):  | 
153  | 
out_name = redirected_file_name('>', arg[1:], args)  | 
|
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
154  | 
out_mode = 'wb+'  | 
155  | 
else:  | 
|
156  | 
remaining.append(arg)  | 
|
157  | 
return in_name, out_name, out_mode, remaining  | 
|
158  | 
||
159  | 
||
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
160  | 
class ScriptRunner(object):  | 
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
161  | 
"""Run a shell-like script from a test.  | 
162  | 
    
 | 
|
163  | 
    Can be used as:
 | 
|
164  | 
||
165  | 
    from bzrlib.tests import script
 | 
|
166  | 
||
167  | 
    ...
 | 
|
168  | 
||
169  | 
        def test_bug_nnnnn(self):
 | 
|
170  | 
            sr = script.ScriptRunner()
 | 
|
171  | 
            sr.run_script(self, '''
 | 
|
172  | 
            $ bzr init
 | 
|
173  | 
            $ bzr do-this
 | 
|
174  | 
            # Boom, error
 | 
|
175  | 
            ''')
 | 
|
176  | 
    """
 | 
|
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
177  | 
|
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
178  | 
def __init__(self):  | 
| 
4665.5.12
by Vincent Ladeuil
 Support '...' in expected strings.  | 
179  | 
self.output_checker = doctest.OutputChecker()  | 
180  | 
self.check_options = doctest.ELLIPSIS  | 
|
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
181  | 
|
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
182  | 
def run_script(self, test_case, text):  | 
183  | 
"""Run a shell-like script as a test.  | 
|
184  | 
||
185  | 
        :param test_case: A TestCase instance that should provide the fail(),
 | 
|
186  | 
            assertEqualDiff and _run_bzr_core() methods as well as a 'test_dir'
 | 
|
187  | 
            attribute used as a jail root.
 | 
|
188  | 
||
189  | 
        :param text: A shell-like script (see _script_to_commands for syntax).
 | 
|
190  | 
        """
 | 
|
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
191  | 
for cmd, input, output, error in _script_to_commands(text):  | 
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
192  | 
self.run_command(test_case, cmd, input, output, error)  | 
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
193  | 
|
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
194  | 
def run_command(self, test_case, cmd, input, output, error):  | 
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
195  | 
mname = 'do_' + cmd[0]  | 
196  | 
method = getattr(self, mname, None)  | 
|
197  | 
if method is None:  | 
|
198  | 
raise SyntaxError('Command not found "%s"' % (cmd[0],),  | 
|
199  | 
None, 1, ' '.join(cmd))  | 
|
200  | 
if input is None:  | 
|
201  | 
str_input = ''  | 
|
202  | 
else:  | 
|
203  | 
str_input = ''.join(input)  | 
|
204  | 
args = list(self._pre_process_args(cmd[1:]))  | 
|
205  | 
retcode, actual_output, actual_error = method(test_case,  | 
|
206  | 
str_input, args)  | 
|
207  | 
||
208  | 
self._check_output(output, actual_output, test_case)  | 
|
209  | 
self._check_output(error, actual_error, test_case)  | 
|
210  | 
if retcode and not error and actual_error:  | 
|
211  | 
test_case.fail('In \n\t%s\nUnexpected error: %s'  | 
|
212  | 
% (' '.join(cmd), actual_error))  | 
|
213  | 
return retcode, actual_output, actual_error  | 
|
214  | 
||
215  | 
def _check_output(self, expected, actual, test_case):  | 
|
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
216  | 
if expected is None:  | 
| 
4665.5.6
by Vincent Ladeuil
 Implement 'bzr' command.  | 
217  | 
            # Specifying None means: any output is accepted
 | 
218  | 
            return
 | 
|
| 
4665.5.12
by Vincent Ladeuil
 Support '...' in expected strings.  | 
219  | 
if actual is None:  | 
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
220  | 
test_case.fail('Unexpected: %s' % actual)  | 
| 
4665.5.12
by Vincent Ladeuil
 Support '...' in expected strings.  | 
221  | 
matching = self.output_checker.check_output(  | 
222  | 
expected, actual, self.check_options)  | 
|
223  | 
if not matching:  | 
|
224  | 
            # Note that we can't use output_checker.output_difference() here
 | 
|
| 
4665.5.15
by Vincent Ladeuil
 Catch the retcode for all commands.  | 
225  | 
            # because... the API is broken ('expected' must be a doctest
 | 
226  | 
            # specific object of which a 'want' attribute will be our
 | 
|
227  | 
            # 'expected' parameter. So we just fallback to our good old
 | 
|
228  | 
            # assertEqualDiff since we know there *are* differences and the
 | 
|
229  | 
            # output should be decently readable.
 | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
230  | 
test_case.assertEqualDiff(expected, actual)  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
231  | 
|
| 
4665.5.19
by Vincent Ladeuil
 Implement globbing and enhance cat to accept multiple files.  | 
232  | 
def _pre_process_args(self, args):  | 
233  | 
new_args = []  | 
|
234  | 
for arg in args:  | 
|
235  | 
            # Strip the simple and double quotes since we don't care about
 | 
|
236  | 
            # them.  We leave the backquotes in place though since they have a
 | 
|
237  | 
            # different semantic.
 | 
|
238  | 
if arg[0] in ('"', "'") and arg[0] == arg[-1]:  | 
|
239  | 
yield arg[1:-1]  | 
|
240  | 
else:  | 
|
241  | 
if glob.has_magic(arg):  | 
|
242  | 
matches = glob.glob(arg)  | 
|
243  | 
if matches:  | 
|
244  | 
                        # We care more about order stability than performance
 | 
|
245  | 
                        # here
 | 
|
246  | 
matches.sort()  | 
|
247  | 
for m in matches:  | 
|
248  | 
yield m  | 
|
249  | 
else:  | 
|
250  | 
yield arg  | 
|
251  | 
||
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
252  | 
def _read_input(self, input, in_name):  | 
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
253  | 
if in_name is not None:  | 
254  | 
infile = open(in_name, 'rb')  | 
|
255  | 
try:  | 
|
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
256  | 
                # Command redirection takes precedence over provided input
 | 
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
257  | 
input = infile.read()  | 
258  | 
finally:  | 
|
259  | 
infile.close()  | 
|
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
260  | 
return input  | 
261  | 
||
262  | 
def _write_output(self, output, out_name, out_mode):  | 
|
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
263  | 
if out_name is not None:  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
264  | 
outfile = open(out_name, out_mode)  | 
| 
4665.5.4
by Vincent Ladeuil
 Implement a 'cat' command.  | 
265  | 
try:  | 
266  | 
outfile.write(output)  | 
|
267  | 
finally:  | 
|
268  | 
outfile.close()  | 
|
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
269  | 
output = None  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
270  | 
return output  | 
271  | 
||
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
272  | 
def do_bzr(self, test_case, input, args):  | 
273  | 
retcode, out, err = test_case._run_bzr_core(  | 
|
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
274  | 
args, retcode=None, encoding=None, stdin=input, working_dir=None)  | 
| 
4665.5.15
by Vincent Ladeuil
 Catch the retcode for all commands.  | 
275  | 
return retcode, out, err  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
276  | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
277  | 
def do_cat(self, test_case, input, args):  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
278  | 
(in_name, out_name, out_mode, args) = _scan_redirection_options(args)  | 
| 
4665.5.19
by Vincent Ladeuil
 Implement globbing and enhance cat to accept multiple files.  | 
279  | 
if args and in_name is not None:  | 
280  | 
raise SyntaxError('Specify a file OR use redirection')  | 
|
281  | 
||
282  | 
inputs = []  | 
|
283  | 
if input:  | 
|
284  | 
inputs.append(input)  | 
|
285  | 
input_names = args  | 
|
286  | 
if in_name:  | 
|
287  | 
args.append(in_name)  | 
|
288  | 
for in_name in input_names:  | 
|
289  | 
try:  | 
|
290  | 
inputs.append(self._read_input(None, in_name))  | 
|
291  | 
except IOError, e:  | 
|
292  | 
if e.errno == errno.ENOENT:  | 
|
293  | 
return (1, None,  | 
|
294  | 
'%s: No such file or directory\n' % (in_name,))  | 
|
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
295  | 
        # Basically cat copy input to output
 | 
| 
4665.5.19
by Vincent Ladeuil
 Implement globbing and enhance cat to accept multiple files.  | 
296  | 
output = ''.join(inputs)  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
297  | 
        # Handle output redirections
 | 
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
298  | 
try:  | 
299  | 
output = self._write_output(output, out_name, out_mode)  | 
|
300  | 
except IOError, e:  | 
|
301  | 
if e.errno == errno.ENOENT:  | 
|
302  | 
return 1, None, '%s: No such file or directory\n' % (out_name,)  | 
|
| 
4665.5.15
by Vincent Ladeuil
 Catch the retcode for all commands.  | 
303  | 
return 0, output, None  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
304  | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
305  | 
def do_echo(self, test_case, input, args):  | 
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
306  | 
(in_name, out_name, out_mode, args) = _scan_redirection_options(args)  | 
307  | 
if input and args:  | 
|
308  | 
raise SyntaxError('Specify parameters OR use redirection')  | 
|
309  | 
if args:  | 
|
| 
4665.5.20
by Vincent Ladeuil
 Fixed as per Martin's review.  | 
310  | 
input = ' '.join(args)  | 
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
311  | 
try:  | 
312  | 
input = self._read_input(input, in_name)  | 
|
313  | 
except IOError, e:  | 
|
314  | 
if e.errno == errno.ENOENT:  | 
|
315  | 
return 1, None, '%s: No such file or directory\n' % (in_name,)  | 
|
| 
4665.5.8
by Vincent Ladeuil
 Implement 'echo' command.  | 
316  | 
        # Always append a \n'
 | 
317  | 
input += '\n'  | 
|
318  | 
        # Process output
 | 
|
319  | 
output = input  | 
|
320  | 
        # Handle output redirections
 | 
|
| 
4665.5.18
by Vincent Ladeuil
 Better redirection handling.  | 
321  | 
try:  | 
322  | 
output = self._write_output(output, out_name, out_mode)  | 
|
323  | 
except IOError, e:  | 
|
324  | 
if e.errno == errno.ENOENT:  | 
|
325  | 
return 1, None, '%s: No such file or directory\n' % (out_name,)  | 
|
| 
4665.5.15
by Vincent Ladeuil
 Catch the retcode for all commands.  | 
326  | 
return 0, output, None  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
327  | 
|
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
328  | 
def _get_jail_root(self, test_case):  | 
329  | 
return test_case.test_dir  | 
|
330  | 
||
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
331  | 
def _ensure_in_jail(self, test_case, path):  | 
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
332  | 
jail_root = self._get_jail_root(test_case)  | 
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
333  | 
if not osutils.is_inside(jail_root, osutils.normalizepath(path)):  | 
334  | 
raise ValueError('%s is not inside %s' % (path, jail_root))  | 
|
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
335  | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
336  | 
def do_cd(self, test_case, input, args):  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
337  | 
if len(args) > 1:  | 
338  | 
raise SyntaxError('Usage: cd [dir]')  | 
|
339  | 
if len(args) == 1:  | 
|
340  | 
d = args[0]  | 
|
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
341  | 
self._ensure_in_jail(test_case, d)  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
342  | 
else:  | 
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
343  | 
            # The test "home" directory is the root of its jail
 | 
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
344  | 
d = self._get_jail_root(test_case)  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
345  | 
os.chdir(d)  | 
| 
4665.5.15
by Vincent Ladeuil
 Catch the retcode for all commands.  | 
346  | 
return 0, None, None  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
347  | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
348  | 
def do_mkdir(self, test_case, input, args):  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
349  | 
if not args or len(args) != 1:  | 
350  | 
raise SyntaxError('Usage: mkdir dir')  | 
|
351  | 
d = args[0]  | 
|
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
352  | 
self._ensure_in_jail(test_case, d)  | 
| 
4665.5.5
by Vincent Ladeuil
 Implement 'cd' and 'mkdir'.  | 
353  | 
os.mkdir(d)  | 
| 
4665.5.15
by Vincent Ladeuil
 Catch the retcode for all commands.  | 
354  | 
return 0, None, None  | 
| 
4665.5.6
by Vincent Ladeuil
 Implement 'bzr' command.  | 
355  | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
356  | 
def do_rm(self, test_case, input, args):  | 
| 
4665.5.17
by Vincent Ladeuil
 Implement 'rm' command.  | 
357  | 
err = None  | 
358  | 
||
359  | 
def error(msg, path):  | 
|
360  | 
return "rm: cannot remove '%s': %s\n" % (path, msg)  | 
|
361  | 
||
362  | 
force, recursive = False, False  | 
|
363  | 
opts = None  | 
|
364  | 
if args and args[0][0] == '-':  | 
|
365  | 
opts = args.pop(0)[1:]  | 
|
366  | 
if 'f' in opts:  | 
|
367  | 
force = True  | 
|
368  | 
opts = opts.replace('f', '', 1)  | 
|
369  | 
if 'r' in opts:  | 
|
370  | 
recursive = True  | 
|
371  | 
opts = opts.replace('r', '', 1)  | 
|
372  | 
if not args or opts:  | 
|
373  | 
raise SyntaxError('Usage: rm [-fr] path+')  | 
|
374  | 
for p in args:  | 
|
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
375  | 
self._ensure_in_jail(test_case, p)  | 
| 
4665.5.17
by Vincent Ladeuil
 Implement 'rm' command.  | 
376  | 
            # FIXME: Should we put that in osutils ?
 | 
377  | 
try:  | 
|
378  | 
os.remove(p)  | 
|
379  | 
except OSError, e:  | 
|
| 
4707.1.1
by Vincent Ladeuil
 Fix OSX and FreeBSD failures.  | 
380  | 
                # Various OSes raises different exceptions (linux: EISDIR,
 | 
381  | 
                #   win32: EACCES, OSX: EPERM) when invoked on a directory
 | 
|
382  | 
if e.errno in (errno.EISDIR, errno.EPERM, errno.EACCES):  | 
|
| 
4665.5.17
by Vincent Ladeuil
 Implement 'rm' command.  | 
383  | 
if recursive:  | 
384  | 
osutils.rmtree(p)  | 
|
385  | 
else:  | 
|
386  | 
err = error('Is a directory', p)  | 
|
387  | 
                        break
 | 
|
388  | 
elif e.errno == errno.ENOENT:  | 
|
389  | 
if not force:  | 
|
390  | 
err = error('No such file or directory', p)  | 
|
391  | 
                        break
 | 
|
392  | 
else:  | 
|
393  | 
                    raise
 | 
|
394  | 
if err:  | 
|
395  | 
retcode = 1  | 
|
396  | 
else:  | 
|
397  | 
retcode = 0  | 
|
398  | 
return retcode, None, err  | 
|
399  | 
||
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
400  | 
|
| 
4665.5.11
by Vincent Ladeuil
 Create a new test case based on TestCaseWithMemoryTransport.  | 
401  | 
class TestCaseWithMemoryTransportAndScript(tests.TestCaseWithMemoryTransport):  | 
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
402  | 
"""Helper class to experiment shell-like test and memory fs.  | 
403  | 
||
404  | 
    This not intended to be used outside of experiments in implementing memoy
 | 
|
405  | 
    based file systems and evolving bzr so that test can use only memory based
 | 
|
406  | 
    resources.
 | 
|
407  | 
    """
 | 
|
| 
4665.5.11
by Vincent Ladeuil
 Create a new test case based on TestCaseWithMemoryTransport.  | 
408  | 
|
409  | 
def setUp(self):  | 
|
410  | 
super(TestCaseWithMemoryTransportAndScript, self).setUp()  | 
|
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
411  | 
self.script_runner = ScriptRunner()  | 
| 
4665.5.11
by Vincent Ladeuil
 Create a new test case based on TestCaseWithMemoryTransport.  | 
412  | 
|
413  | 
def run_script(self, script):  | 
|
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
414  | 
return self.script_runner.run_script(self, script)  | 
| 
4665.5.11
by Vincent Ladeuil
 Create a new test case based on TestCaseWithMemoryTransport.  | 
415  | 
|
416  | 
def run_command(self, cmd, input, output, error):  | 
|
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
417  | 
return self.script_runner.run_command(self, cmd, input, output, error)  | 
| 
4665.5.11
by Vincent Ladeuil
 Create a new test case based on TestCaseWithMemoryTransport.  | 
418  | 
|
419  | 
||
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
420  | 
class TestCaseWithTransportAndScript(tests.TestCaseWithTransport):  | 
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
421  | 
"""Helper class to quickly define shell-like tests.  | 
422  | 
||
423  | 
    Can be used as:
 | 
|
424  | 
||
425  | 
    from bzrlib.tests import script
 | 
|
426  | 
||
427  | 
||
428  | 
    class TestBug(script.TestCaseWithTransportAndScript):
 | 
|
429  | 
||
430  | 
        def test_bug_nnnnn(self):
 | 
|
431  | 
            self.run_script('''
 | 
|
432  | 
            $ bzr init
 | 
|
433  | 
            $ bzr do-this
 | 
|
434  | 
            # Boom, error
 | 
|
435  | 
            ''')
 | 
|
436  | 
    """
 | 
|
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
437  | 
|
438  | 
def setUp(self):  | 
|
439  | 
super(TestCaseWithTransportAndScript, self).setUp()  | 
|
| 
4665.5.23
by Vincent Ladeuil
 Revert the jail_root parameter addition.  | 
440  | 
self.script_runner = ScriptRunner()  | 
441  | 
||
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
442  | 
def run_script(self, script):  | 
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
443  | 
return self.script_runner.run_script(self, script)  | 
| 
4665.5.10
by Vincent Ladeuil
 Start separating the script runner from the test case.  | 
444  | 
|
445  | 
def run_command(self, cmd, input, output, error):  | 
|
| 
4665.5.24
by Vincent Ladeuil
 Scripts can be used without imposing a test base class.  | 
446  | 
return self.script_runner.run_command(self, cmd, input, output, error)  | 
| 
4665.5.22
by Vincent Ladeuil
 Try to relax the test_case/script runner coupling.  | 
447  |