← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_parents.py

Merge updated set_parents api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_parents.py
47
47
 
48
48
    def test_set_one_ghost_parent_rejects(self):
49
49
        t = self.make_branch_and_tree('.')
50
 
        self.assertRaises(errors.GhostRevision,
 
50
        self.assertRaises(errors.GhostRevisionUnusableHere,
51
51
            t.set_parent_trees, [('missing-revision-id', None)])
52
52
 
53
53
    def test_set_one_ghost_parent_force(self):
94
94
 
95
95
    def test_set_one_ghost_parent_ids_rejects(self):
96
96
        t = self.make_branch_and_tree('.')
97
 
        self.assertRaises(errors.GhostRevision,
 
97
        self.assertRaises(errors.GhostRevisionUnusableHere,
98
98
            t.set_parent_ids, ['missing-revision-id'])
99
99
 
100
100
    def test_set_one_ghost_parent_ids_force(self):
141
141
    def test_add_first_parent_id_ghost_rejects(self):
142
142
        """Test adding the first parent id - as a ghost"""
143
143
        tree = self.make_branch_and_tree('.')
144
 
        self.assertRaises(errors.GhostRevision,
 
144
        self.assertRaises(errors.GhostRevisionUnusableHere,
145
145
            tree.add_parent_tree_id, 'first-revision')
146
146
        
147
147
    def test_add_first_parent_id_ghost_force(self):
178
178
    def test_add_first_parent_tree_ghost_rejects(self):
179
179
        """Test adding the first parent id - as a ghost"""
180
180
        tree = self.make_branch_and_tree('.')
181
 
        self.assertRaises(errors.GhostRevision,
 
181
        self.assertRaises(errors.GhostRevisionUnusableHere,
182
182
            tree.add_parent_tree, ('first-revision', None))
183
183
        
184
184
    def test_add_first_parent_tree_ghost_force(self):