~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/repository_implementations/test_reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 00:37:41 UTC
  • mfrom: (1594.2.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308003741-08afccbf89005e87
Merge in :
 * Knit repositories use knits
 * Nested progress bar support.
 * Ghost aware graph api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
101
101
        repo = d.open_repository()
102
102
        backup = repo.control_weaves.get_weave('inventory.backup',
103
103
                                               repo.get_transaction())
104
 
        self.assertTrue('missing' in backup.names())
105
 
        self.assertRaises(errors.WeaveRevisionNotPresent,
 
104
        self.assertTrue('missing' in backup.versions())
 
105
        self.assertRaises(errors.RevisionNotPresent,
106
106
                          repo.get_inventory, 'missing')
107
107
 
108
108
    def test_reweave_inventory_without_revision_reconciler(self):
119
119
        repo = d.open_repository()
120
120
        backup = repo.control_weaves.get_weave('inventory.backup',
121
121
                                               repo.get_transaction())
122
 
        self.assertTrue('missing' in backup.names())
123
 
        self.assertRaises(errors.WeaveRevisionNotPresent,
 
122
        self.assertTrue('missing' in backup.versions())
 
123
        self.assertRaises(errors.RevisionNotPresent,
124
124
                          repo.get_inventory, 'missing')
125
125
 
126
126
    def test_reweave_inventory_without_revision(self):
136
136
        repo = d.open_repository()
137
137
        backup = repo.control_weaves.get_weave('inventory.backup',
138
138
                                               repo.get_transaction())
139
 
        self.assertTrue('missing' in backup.names())
140
 
        self.assertRaises(errors.WeaveRevisionNotPresent,
 
139
        self.assertTrue('missing' in backup.versions())
 
140
        self.assertRaises(errors.RevisionNotPresent,
141
141
                          repo.get_inventory, 'missing')
142
142
        # and the parent list for 'references_missing' should have that
143
143
        # revision a ghost now.