/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf_ui.py

  • Committer: Aaron Bentley
  • Date: 2009-08-24 16:56:26 UTC
  • mto: This revision was merged to the branch mainline in revision 4641.
  • Revision ID: aaron@aaronbentley.com-20090824165626-rrxbl8hvxkofbj7l
Update from review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
278
278
        inner_tree = self.make_branch_and_tree('outer/inner')
279
279
        rev2 = inner_tree.commit('Add root')
280
280
        outer_tree.subsume(inner_tree)
 
281
        # This is essentially assertNotRaises(ValueError).
 
282
        # The ValueError is 'None is not a valid file id'.
281
283
        self.expectFailure('Cannot shelve a join back to the inner tree.',
282
284
                           self.assertRaises, AssertionError,
283
285
                           self.assertRaises, ValueError, self.shelve_all,