← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf_ui.py

Merge changes from vila.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
315
315
        # This is essentially assertNotRaises(InconsistentDelta)
316
316
        with ExpectedException(AssertionError,
317
317
                               'InconsistentDelta not raised'):
 
318
            # We expect errors.InconsistentDelta to not be raised.
 
319
            # ExpectedException will raise an AssertionError that we'll catch
 
320
            # in the enclosing 'with'
318
321
            with ExpectedException(errors.InconsistentDelta, ''):
319
322
                self.shelve_all(tree1, rev2)
320
323