← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/lock_helpers.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/lock_helpers.py
17
17
"""Helper functions/classes for testing locking"""
18
18
 
19
19
from bzrlib import errors
 
20
from bzrlib.decorators import only_raises
20
21
 
21
22
 
22
23
class TestPreventLocking(errors.LockError):
68
69
            return self._other.lock_write()
69
70
        raise TestPreventLocking('lock_write disabled')
70
71
 
 
72
    @only_raises(errors.LockNotHeld, errors.LockBroken)
71
73
    def unlock(self):
72
74
        self._sequence.append((self._other_id, 'ul', self._allow_unlock))
73
75
        if self._allow_unlock: