← 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

  • Committer: Andrew Bennetts
  • Date: 2010-09-17 04:35:23 UTC
  • mfrom: (5050.17.20 2.2)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
190
190
        shelver.expect('Shelve adding file "foo"? [yNfq?]', 'y')
191
191
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
192
192
        shelver.run()
193
 
        self.assertPathDoesNotExist('tree/foo')
 
193
        self.failIfExists('tree/foo')
194
194
 
195
195
    def test_shelve_kind_change(self):
196
196
        tree = self.create_shelvable_tree()
422
422
        shelver.expect('Delete file "foo"? [yNfq?]', 'y')
423
423
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
424
424
        shelver.run()
425
 
        self.assertPathDoesNotExist('tree/foo')
 
425
        self.failIfExists('tree/foo')
426
426
 
427
427
    def test_shelve_kind_change(self):
428
428
        tree = self.create_shelvable_tree()