/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: 2008-11-03 21:52:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081103215246-xcpvqnno9d1lhmz4
raise UserAbort instead of doing sys.exit

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
18
18
from cStringIO import StringIO
19
19
import os
20
20
 
21
 
from bzrlib import shelf_ui, tests
 
21
from bzrlib import errors, shelf_ui, tests
22
22
 
23
23
 
24
24
class ExpectShelver(shelf_ui.Shelver):
173
173
        tree = self.create_shelvable_tree()
174
174
        shelver = ExpectShelver(tree, tree.basis_tree())
175
175
        shelver.expect('Shelve? [yNfq]', 'q')
176
 
        self.assertRaises(SystemExit, shelver.run)
 
176
        self.assertRaises(errors.UserAbort, shelver.run)
177
177
        self.assertFileEqual(LINES_ZY, 'tree/foo')
178
178
 
179
179
    def test_shelve_all(self):