← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_errors.py

  • Committer: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_errors.py
21
21
from bzrlib import (
22
22
    bzrdir,
23
23
    errors,
 
24
    symbol_versioning,
24
25
    )
25
26
from bzrlib.tests import TestCase, TestCaseWithTransport
26
27
 
27
28
 
28
 
# TODO: Make sure builtin exception class formats are consistent - e.g. should
29
 
# or shouldn't end with a full stop, etc.
30
 
 
31
29
 
32
30
class TestErrors(TestCaseWithTransport):
33
31
 
142
140
            str(error))
143
141
 
144
142
    def test_read_only_lock_error(self):
145
 
        error = errors.ReadOnlyLockError('filename', 'error message')
 
143
        error = self.applyDeprecated(symbol_versioning.zero_ninetytwo,
 
144
            errors.ReadOnlyLockError, 'filename', 'error message')
146
145
        self.assertEqualDiff("Cannot acquire write lock on filename."
147
146
                             " error message", str(error))
148
147
 
 
148
    def test_lock_failed(self):
 
149
        error = errors.LockFailed('http://canonical.com/', 'readonly transport')
 
150
        self.assertEqualDiff("Cannot lock http://canonical.com/: readonly transport",
 
151
            str(error))
 
152
        self.assertFalse(error.internal_error)
 
153
 
149
154
    def test_too_many_concurrent_requests(self):
150
155
        error = errors.TooManyConcurrentRequests("a medium")
151
156
        self.assertEqualDiff("The medium 'a medium' has reached its concurrent "