← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_request.py

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_request.py
159
159
            ('NoSuchFile', 'path'), errors.NoSuchFile('path'))
160
160
 
161
161
    def test_LockContention(self):
 
162
        # For now, LockContentions are always transmitted with no details.
 
163
        # Eventually they should include a relpath or url or something else to
 
164
        # identify which lock is busy.
162
165
        self.assertTranslationEqual(
163
 
            ('LockContention', 'lock', 'msg'),
164
 
            errors.LockContention('lock', 'msg'))
 
166
            ('LockContention',), errors.LockContention('lock', 'msg'))
165
167
 
166
168
    def test_TokenMismatch(self):
167
169
        self.assertTranslationEqual(