/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tests/test_repository.py

Fix compatibility with newer versions of Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_repository.py
50
50
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
51
51
    """Feature tests for GitRepository."""
52
52
 
 
53
    _test_needs_features = [tests.GitCommandFeature]
 
54
 
53
55
    def _do_commit(self):
54
56
        builder = tests.GitBranchBuilder()
55
57
        builder.set_file('a', 'text for a\n', False)
67
69
        GitRepo.init(self.test_dir)
68
70
 
69
71
        repo = Repository.open('.')
70
 
        self.assertIsInstance(repo._git, dulwich.repo.BaseRepo)
 
72
        self.assertIsInstance(repo._git, dulwich.repo.Repo)
71
73
 
72
74
    def test_has_revision(self):
73
75
        GitRepo.init(self.test_dir)
117
119
        mapping = builder.finish()
118
120
        return mapping[commit_handle]
119
121
 
120
 
    def test_pack(self):
121
 
        commit_id = self.simple_commit()
122
 
        repo = Repository.open('.')
123
 
        repo.pack()
124
 
 
125
122
    def test_revision_tree(self):
126
123
        commit_id = self.simple_commit()
127
124
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
165
162
 
166
163
class TestGitRepository(tests.TestCaseWithTransport):
167
164
 
168
 
    def _do_commit(self):
169
 
        builder = tests.GitBranchBuilder()
170
 
        builder.set_file('a', 'text for a\n', False)
171
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
172
 
        mapping = builder.finish()
173
 
        return mapping[commit_handle]
174
 
 
175
165
    def setUp(self):
176
166
        tests.TestCaseWithTransport.setUp(self)
177
167
        dulwich.repo.Repo.create(self.test_dir)
190
180
    def test_all_revision_ids_none(self):
191
181
        self.assertEquals(set([]), self.git_repo.all_revision_ids())
192
182
 
193
 
    def test_all_revision_ids(self):
194
 
        commit_id = self._do_commit()
195
 
        self.assertEquals(
196
 
                set([default_mapping.revision_id_foreign_to_bzr(commit_id)]),
197
 
                self.git_repo.all_revision_ids())
198
 
 
199
183
    def test_get_ancestry_null(self):
200
184
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
201
185
 
255
239
        store, store_iter = self.object_iter()
256
240
        store._cache.idmap.start_write_group()
257
241
        try:
258
 
            return store_iter.import_revision(revid, roundtrip=False)
 
242
            return store_iter.import_revision(revid)
259
243
        except:
260
244
            store._cache.idmap.abort_write_group()
261
245
            raise
275
259
class ForeignTestsRepositoryFactory(object):
276
260
 
277
261
    def make_repository(self, transport):
278
 
        return dir.LocalGitControlDirFormat().initialize_on_transport(transport).open_repository()
 
262
        return dir.LocalGitBzrDirFormat().initialize_on_transport(transport).open_repository()