← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
92
92
        tree.basis_tree()
93
93
        revtree.lock_read()
94
94
        self.addCleanup(revtree.unlock)
95
 
        new_inv = revtree.inventory
96
 
        delta = self.make_inv_delta(
97
 
            tree.branch.repository.revision_tree(revision.NULL_REVISION).inventory,
98
 
            new_inv)
 
95
        old_inv = tree.branch.repository.revision_tree(revision.NULL_REVISION).root_inventory
 
96
        new_inv = revtree.root_inventory
 
97
        delta = self.make_inv_delta(old_inv, new_inv)
99
98
        repo_direct = self._get_repo_in_write_group('direct')
100
99
        add_validator = repo_direct.add_inventory(revid, new_inv, [])
101
100
        repo_direct.commit_write_group()
109
108
        else:
110
109
            repo_delta.commit_write_group()
111
110
        self.assertEqual(add_validator, delta_validator)
112
 
        self.assertEqual(new_inv, inv)
 
111
        self.assertEqual(list(new_inv.iter_entries()), list(inv.iter_entries()))