/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_cleanup.py

Rework test_script a little bit.


Don't allow someone to request a stdin request to echo.
Echo never reads from stdin, it just echos its arguments.
You use 'cat' if you want to read from stdin.

A few other fixes because the tests were using filenames
that are actually illegal on Windows, rather than just
nonexistant.


Change the exception handling for commands so that
unknown errors don't get silently squashed and then
turn into hard-to-debug errors later.

test_script now passes on Windows.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_cleanup.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
39
39
        self.call_log.append('no_op_cleanup')
40
40
 
41
41
    def assertLogContains(self, regex):
42
 
        self.assertContainsRe(self.get_log(), regex, re.DOTALL)
 
42
        log = self._get_log(keep_log_file=True)
 
43
        self.assertContainsRe(log, regex, re.DOTALL)
43
44
 
44
45
    def failing_cleanup(self):
45
46
        self.call_log.append('failing_cleanup')
183
184
        self.assertRaises(ErrorA, _do_with_cleanups, cleanups,
184
185
            self.trivial_func)
185
186
        self.assertLogContains('Cleanup failed:.*ErrorB')
186
 
        self.assertFalse('ErrorA' in self.get_log())
 
187
        log = self._get_log(keep_log_file=True)
 
188
        self.assertFalse('ErrorA' in log)
187
189
 
188
190
    def make_two_failing_cleanup_funcs(self):
189
191
        def raise_a():