← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

  • Committer: Mark Hammond
  • Date: 2008-12-28 05:21:23 UTC
  • mfrom: (3920 +trunk)
  • mto: (3932.1.1 prepare-1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mhammond@skippinet.com.au-20081228052123-f78xs5sbdkotshwf
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
457
457
        unshelver = shelf_manager.get_unshelver(shelf_id)
458
458
        unshelver.make_merger().do_merge()
459
459
        self.assertFileEqual('bar', 'tree/foo')
 
460
 
 
461
    def test_get_metadata(self):
 
462
        tree = self.make_branch_and_tree('.')
 
463
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
464
        shelf_manager = tree.get_shelf_manager()
 
465
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
 
466
        metadata = shelf_manager.get_metadata(shelf_id)
 
467
        self.assertEqual('foo', metadata['message'])
 
468
        self.assertEqual('null:', metadata['revision_id'])