← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/__init__.py
37
37
 
38
38
from bzrlib.repository import (
39
39
    format_registry,
40
 
    InterDifferingSerializer,
41
40
    InterRepository,
42
41
    )
43
42
from bzrlib.tests import (
46
45
    multiply_tests,
47
46
    )
48
47
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
 
48
from bzrlib.vf_repository import (
 
49
    InterDifferingSerializer,
 
50
    )
49
51
 
50
52
 
51
53
def make_scenarios(transport_server, transport_readonly_server, formats):
74
76
    from bzrlib.repofmt import (
75
77
        groupcompress_repo,
76
78
        knitrepo,
77
 
        pack_repo,
 
79
        knitpack_repo,
78
80
        )
79
81
    result = []
80
82
    def add_combo(interrepo_cls, from_format, to_format, extra_setup=None,
120
122
              knitrepo.RepositoryFormatKnit3())
121
123
    add_combo(knitrepo.InterKnitRepo,
122
124
              knitrepo.RepositoryFormatKnit1(),
123
 
              pack_repo.RepositoryFormatKnitPack1())
 
125
              knitpack_repo.RepositoryFormatKnitPack1())
124
126
    add_combo(knitrepo.InterKnitRepo,
125
 
              pack_repo.RepositoryFormatKnitPack1(),
 
127
              knitpack_repo.RepositoryFormatKnitPack1(),
126
128
              knitrepo.RepositoryFormatKnit1())
127
129
    add_combo(knitrepo.InterKnitRepo,
128
130
              knitrepo.RepositoryFormatKnit3(),
129
 
              pack_repo.RepositoryFormatKnitPack3())
 
131
              knitpack_repo.RepositoryFormatKnitPack3())
130
132
    add_combo(knitrepo.InterKnitRepo,
131
 
              pack_repo.RepositoryFormatKnitPack3(),
 
133
              knitpack_repo.RepositoryFormatKnitPack3(),
132
134
              knitrepo.RepositoryFormatKnit3())
133
135
    add_combo(knitrepo.InterKnitRepo,
134
 
              pack_repo.RepositoryFormatKnitPack3(),
135
 
              pack_repo.RepositoryFormatKnitPack4())
136
 
    add_combo(InterDifferingSerializer,
137
 
              pack_repo.RepositoryFormatKnitPack1(),
138
 
              pack_repo.RepositoryFormatKnitPack6RichRoot())
139
 
    add_combo(InterDifferingSerializer,
140
 
              pack_repo.RepositoryFormatKnitPack1(),
141
 
              pack_repo.RepositoryFormatKnitPack6RichRoot(),
 
136
              knitpack_repo.RepositoryFormatKnitPack3(),
 
137
              knitpack_repo.RepositoryFormatKnitPack4())
 
138
    add_combo(InterDifferingSerializer,
 
139
              knitpack_repo.RepositoryFormatKnitPack1(),
 
140
              knitpack_repo.RepositoryFormatKnitPack6RichRoot())
 
141
    add_combo(InterDifferingSerializer,
 
142
              knitpack_repo.RepositoryFormatKnitPack1(),
 
143
              knitpack_repo.RepositoryFormatKnitPack6RichRoot(),
142
144
              force_known_graph,
143
145
              label='InterDifferingSerializer+get_known_graph_ancestry')
144
146
    add_combo(InterDifferingSerializer,
145
 
              pack_repo.RepositoryFormatKnitPack6RichRoot(),
 
147
              knitpack_repo.RepositoryFormatKnitPack6RichRoot(),
146
148
              groupcompress_repo.RepositoryFormat2a())
147
149
    add_combo(InterDifferingSerializer,
148
150
              groupcompress_repo.RepositoryFormat2a(),
149
 
              pack_repo.RepositoryFormatKnitPack6RichRoot())
 
151
              knitpack_repo.RepositoryFormatKnitPack6RichRoot())
150
152
    return result
151
153
 
152
154