← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-19 14:42:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5900.
  • Revision ID: john@arbash-meinel.com-20110519144205-427xxh4ob11g8zqy
Rename 'expect_fail' to 'invalid_delta' as suggested by Jelmer
Makes the actual value of the parameter clearer to understand.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
85
85
        repo.texts.add_lines((ie.file_id, ie.revision), [], lines)
86
86
 
87
87
 
88
 
def apply_inventory_Inventory(self, basis, delta, expect_fail=True):
 
88
def apply_inventory_Inventory(self, basis, delta, invalid_delta=True):
89
89
    """Apply delta to basis and return the result.
90
90
 
91
91
    :param basis: An inventory to be used as the basis.
96
96
    return basis
97
97
 
98
98
 
99
 
def apply_inventory_WT(self, basis, delta, expect_fail=True):
 
99
def apply_inventory_WT(self, basis, delta, invalid_delta=True):
100
100
    """Apply delta to basis and return the result.
101
101
 
102
102
    This sets the tree state to be basis, and then calls apply_inventory_delta.
125
125
    tree = tree.bzrdir.open_workingtree()
126
126
    tree.lock_read()
127
127
    self.addCleanup(tree.unlock)
128
 
    if not expect_fail:
 
128
    if not invalid_delta:
129
129
        tree._validate()
130
130
    return tree.inventory
131
131
 
132
132
 
133
 
def _create_repo_revisions(repo, basis, delta, expect_fail):
 
133
def _create_repo_revisions(repo, basis, delta, invalid_delta):
134
134
    repo.start_write_group()
135
135
    try:
136
136
        rev = revision.Revision('basis', timestamp=0, timezone=None,
138
138
        basis.revision_id = 'basis'
139
139
        create_texts_for_inv(repo, basis)
140
140
        repo.add_revision('basis', rev, basis)
141
 
        if expect_fail:
 
141
        if invalid_delta:
142
142
            # We don't want to apply the delta to the basis, because we expect
143
143
            # the delta is invalid.
144
144
            result_inv = basis
183
183
        tree.add(['unique-dir/' + file_id], [file_id], [ie.kind])
184
184
 
185
185
 
186
 
def apply_inventory_WT_basis(test, basis, delta, expect_fail=True):
 
186
def apply_inventory_WT_basis(test, basis, delta, invalid_delta=True):
187
187
    """Apply delta to basis and return the result.
188
188
 
189
189
    This sets the parent and then calls update_basis_by_delta.
203
203
    tree.lock_write()
204
204
    try:
205
205
        target_entries = _create_repo_revisions(tree.branch.repository, basis,
206
 
                                                delta, expect_fail)
 
206
                                                delta, invalid_delta)
207
207
        # Set the basis state as the trees current state
208
208
        tree._write_inventory(basis)
209
209
        # This reads basis from the repo and puts it into the tree's local
215
215
    tree.lock_write()
216
216
    try:
217
217
        tree.update_basis_by_delta('result', delta)
218
 
        if not expect_fail:
 
218
        if not invalid_delta:
219
219
            tree._validate()
220
220
    finally:
221
221
        tree.unlock()
232
232
 
233
233
 
234
234
def apply_inventory_Repository_add_inventory_by_delta(self, basis, delta,
235
 
                                                      expect_fail=True):
 
235
                                                      invalid_delta=True):
236
236
    """Apply delta to basis and return the result.
237
237
    
238
238
    This inserts basis as a whole inventory and then uses
607
607
        file1.text_size = 0
608
608
        file1.text_sha1 = ''
609
609
        delta = [(None, u'path', 'file-id', file1)]
610
 
        res_inv = self.apply_delta(self, inv, delta, expect_fail=False)
 
610
        res_inv = self.apply_delta(self, inv, delta, invalid_delta=False)
611
611
        self.assertEqual('file-id', res_inv['file-id'].file_id)
612
612
 
613
613
    def test_remove_file(self):
618
618
        file1.text_sha1 = ''
619
619
        inv.add(file1)
620
620
        delta = [(u'path', None, 'file-id', None)]
621
 
        res_inv = self.apply_delta(self, inv, delta, expect_fail=False)
 
621
        res_inv = self.apply_delta(self, inv, delta, invalid_delta=False)
622
622
        self.assertEqual(None, res_inv.path2id('path'))
623
623
        self.assertRaises(errors.NoSuchId, res_inv.id2path, 'file-id')
624
624
 
628
628
        inv.add(file1)
629
629
        file2 = self.make_file_ie(name='path2', parent_id=inv.root.file_id)
630
630
        delta = [(u'path', 'path2', 'file-id', file2)]
631
 
        res_inv = self.apply_delta(self, inv, delta, expect_fail=False)
 
631
        res_inv = self.apply_delta(self, inv, delta, invalid_delta=False)
632
632
        self.assertEqual(None, res_inv.path2id('path'))
633
633
        self.assertEqual('file-id', res_inv.path2id('path2'))
634
634
 
639
639
        file2 = self.make_file_ie(file_id='id2', parent_id=inv.root.file_id)
640
640
        delta = [(u'name', None, 'id1', None),
641
641
                 (None, u'name', 'id2', file2)]
642
 
        res_inv = self.apply_delta(self, inv, delta, expect_fail=False)
 
642
        res_inv = self.apply_delta(self, inv, delta, invalid_delta=False)
643
643
        self.assertEqual('id2', res_inv.path2id('name'))
644
644
 
645
645
    def test_rename_dir(self):
652
652
        dir2 = inventory.InventoryDirectory('dir-id', 'dir2', inv.root.file_id)
653
653
        dir2.revision = 'result'
654
654
        delta = [('dir1', 'dir2', 'dir-id', dir2)]
655
 
        res_inv = self.apply_delta(self, inv, delta, expect_fail=False)
 
655
        res_inv = self.apply_delta(self, inv, delta, invalid_delta=False)
656
656
        # The file should be accessible under the new path
657
657
        self.assertEqual('file-id', res_inv.path2id('dir2/name'))
658
658
 
670
670
        file2b = self.make_file_ie('file-id-2', 'name2', inv.root.file_id)
671
671
        delta = [('dir1', 'dir2', 'dir-id', dir2),
672
672
                 ('dir1/name2', 'name2', 'file-id-2', file2b)]
673
 
        res_inv = self.apply_delta(self, inv, delta, expect_fail=False)
 
673
        res_inv = self.apply_delta(self, inv, delta, invalid_delta=False)
674
674
        # The file should be accessible under the new path
675
675
        self.assertEqual('file-id-1', res_inv.path2id('dir2/name1'))
676
676
        self.assertEqual(None, res_inv.path2id('dir2/name2'))