← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-13 07:59:39 UTC
  • mfrom: (5418.1.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100913075939-nh4c1k7rkuxle7zk
(spiv) Merge lp:bzr/2.2, including fixes for #619872, #631350,
        #633745.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_errors.py
159
159
            "cannot be broken.",
160
160
            str(error))
161
161
 
 
162
    def test_lock_corrupt(self):
 
163
        error = errors.LockCorrupt("corruption info")
 
164
        self.assertEqualDiff("Lock is apparently held, but corrupted: "
 
165
            "corruption info\n"
 
166
            "Use 'bzr break-lock' to clear it",
 
167
            str(error))
 
168
 
162
169
    def test_knit_data_stream_incompatible(self):
163
170
        error = errors.KnitDataStreamIncompatible(
164
171
            'stream format', 'target format')