/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: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

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.failIfExists('tree/foo')
 
193
        self.assertPathDoesNotExist('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.failIfExists('tree/foo')
 
425
        self.assertPathDoesNotExist('tree/foo')
426
426
 
427
427
    def test_shelve_kind_change(self):
428
428
        tree = self.create_shelvable_tree()