← 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: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
17
17
"""Tests for Repository.add_inventory_by_delta."""
18
18
 
19
19
from bzrlib import errors, revision
20
 
from bzrlib.tests.per_repository import TestCaseWithRepository
 
20
from bzrlib.tests.per_repository_vf import (
 
21
    all_repository_vf_format_scenarios,
 
22
    TestCaseWithRepository
 
23
    )
 
24
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
25
 
 
26
load_tests = load_tests_apply_scenarios
21
27
 
22
28
 
23
29
class TestAddInventoryByDelta(TestCaseWithRepository):
24
30
 
 
31
    scenarios = all_repository_vf_format_scenarios()
 
32
 
25
33
    def _get_repo_in_write_group(self, path='repository'):
26
34
        repo = self.make_repository(path)
27
35
        repo.lock_write()
84
92
        tree.basis_tree()
85
93
        revtree.lock_read()
86
94
        self.addCleanup(revtree.unlock)
87
 
        new_inv = revtree.inventory
88
 
        delta = self.make_inv_delta(
89
 
            tree.branch.repository.revision_tree(revision.NULL_REVISION).inventory,
90
 
            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)
91
98
        repo_direct = self._get_repo_in_write_group('direct')
92
99
        add_validator = repo_direct.add_inventory(revid, new_inv, [])
93
100
        repo_direct.commit_write_group()
101
108
        else:
102
109
            repo_delta.commit_write_group()
103
110
        self.assertEqual(add_validator, delta_validator)
104
 
        self.assertEqual(new_inv, inv)
 
111
        self.assertEqual(list(new_inv.iter_entries()), list(inv.iter_entries()))