← 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: Canonical.com Patch Queue Manager
  • Date: 2009-08-28 06:40:33 UTC
  • mfrom: (4596.1.7 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090828064033-q7eyzxnnyc3jcpag
(mbp) merge 1.18 and 2.0 back to trunk; bump version to 2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
473
473
        self.addCleanup(creator.finalize)
474
474
        self.assertEqual([], list(creator.iter_shelvable()))
475
475
 
 
476
    def test_shelve_skips_added_root(self):
 
477
        """Skip adds of the root when iterating through shelvable changes."""
 
478
        tree = self.make_branch_and_tree('tree')
 
479
        tree.lock_tree_write()
 
480
        self.addCleanup(tree.unlock)
 
481
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
482
        self.addCleanup(creator.finalize)
 
483
        self.assertEqual([], list(creator.iter_shelvable()))
 
484
 
476
485
 
477
486
class TestUnshelver(tests.TestCaseWithTransport):
478
487