/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 breezy/plugins/git/tests/test_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-15 19:05:51 UTC
  • mfrom: (6968 work)
  • mto: (6973.5.1 python3-c)
  • mto: This revision was merged to the branch mainline in revision 6984.
  • Revision ID: jelmer@jelmer.uk-20180515190551-epr5abd0mtxmrehr
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_repository.py
55
55
 
56
56
    def _do_commit(self):
57
57
        builder = tests.GitBranchBuilder()
58
 
        builder.set_file('a', 'text for a\n', False)
59
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
58
        builder.set_file(b'a', b'text for a\n', False)
 
59
        commit_handle = builder.commit(b'Joe Foo <joe@foo.com>', b'message')
60
60
        mapping = builder.finish()
61
61
        return mapping[commit_handle]
62
62
 
76
76
        GitRepo.init(self.test_dir)
77
77
        commit_id = self._do_commit()
78
78
        repo = Repository.open('.')
79
 
        self.assertFalse(repo.has_revision('foobar'))
 
79
        self.assertFalse(repo.has_revision(b'foobar'))
80
80
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
81
81
        self.assertTrue(repo.has_revision(revid))
82
82
 
84
84
        GitRepo.init(self.test_dir)
85
85
        commit_id = self._do_commit()
86
86
        repo = Repository.open('.')
87
 
        self.assertEquals(set(), repo.has_revisions(['foobar']))
 
87
        self.assertEqual(set(), repo.has_revisions([b'foobar']))
88
88
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
89
 
        self.assertEquals(set([revid]), repo.has_revisions(['foobar', revid]))
 
89
        self.assertEqual(set([revid]), repo.has_revisions([b'foobar', revid]))
90
90
 
91
91
    def test_get_revision(self):
92
92
        # GitRepository.get_revision gives a Revision object.
111
111
        # Create a git repository with some interesting files in a revision.
112
112
        GitRepo.init(self.test_dir)
113
113
        builder = tests.GitBranchBuilder()
114
 
        builder.set_file('data', 'text\n', False)
115
 
        builder.set_file('executable', 'content', True)
116
 
        builder.set_link('link', 'broken')
117
 
        builder.set_file('subdir/subfile', 'subdir text\n', False)
118
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message',
 
114
        builder.set_file(b'data', b'text\n', False)
 
115
        builder.set_file(b'executable', b'content', True)
 
116
        builder.set_link(b'link', b'broken')
 
117
        builder.set_file(b'subdir/subfile', b'subdir text\n', False)
 
118
        commit_handle = builder.commit(b'Joe Foo <joe@foo.com>', b'message',
119
119
            timestamp=1205433193)
120
120
        mapping = builder.finish()
121
121
        return mapping[commit_handle]
130
130
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
131
131
        repo = Repository.open('.')
132
132
        tree = repo.revision_tree(revid)
133
 
        self.assertEquals(tree.get_revision_id(), revid)
134
 
        self.assertEquals("text\n", tree.get_file_text("data"))
 
133
        self.assertEqual(tree.get_revision_id(), revid)
 
134
        self.assertEqual("text\n", tree.get_file_text("data"))
135
135
 
136
136
 
137
137
class TestGitRepository(tests.TestCaseWithTransport):
138
138
 
139
139
    def _do_commit(self):
140
140
        builder = tests.GitBranchBuilder()
141
 
        builder.set_file('a', 'text for a\n', False)
142
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
141
        builder.set_file(b'a', b'text for a\n', False)
 
142
        commit_handle = builder.commit(b'Joe Foo <joe@foo.com>', b'message')
143
143
        mapping = builder.finish()
144
144
        return mapping[commit_handle]
145
145
 
156
156
        self.assertRaises(errors.NoSuchRevision, self.git_repo.get_signature_text, revision.NULL_REVISION)
157
157
 
158
158
    def test_has_signature_for_revision_id(self):
159
 
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
 
159
        self.assertEqual(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
160
160
 
161
161
    def test_all_revision_ids_none(self):
162
 
        self.assertEquals([], self.git_repo.all_revision_ids())
 
162
        self.assertEqual([], self.git_repo.all_revision_ids())
163
163
 
164
164
    def test_get_known_graph_ancestry(self):
165
165
        cid = self._do_commit()
166
166
        revid = default_mapping.revision_id_foreign_to_bzr(cid)
167
167
        g = self.git_repo.get_known_graph_ancestry([revid])
168
 
        self.assertEquals(frozenset([revid]),
 
168
        self.assertEqual(frozenset([revid]),
169
169
            g.heads([revid]))
170
170
        self.assertEqual([(revid, 0, (1,), True)],
171
171
            [(n.key, n.merge_depth, n.revno, n.end_of_merge)
173
173
 
174
174
    def test_all_revision_ids(self):
175
175
        commit_id = self._do_commit()
176
 
        self.assertEquals(
 
176
        self.assertEqual(
177
177
                [default_mapping.revision_id_foreign_to_bzr(commit_id)],
178
178
                self.git_repo.all_revision_ids())
179
179
 
190
190
        self.assertIs(None, tree.get_root_id())
191
191
 
192
192
    def test_get_parent_map_null(self):
193
 
        self.assertEquals({revision.NULL_REVISION: ()}, 
 
193
        self.assertEqual({revision.NULL_REVISION: ()},
194
194
                           self.git_repo.get_parent_map([revision.NULL_REVISION]))
195
195
 
196
196
 
223
223
        self.format = repository.GitRepositoryFormat()
224
224
 
225
225
    def test_get_format_description(self):
226
 
        self.assertEquals("Git Repository", self.format.get_format_description())
 
226
        self.assertEqual("Git Repository",
 
227
                          self.format.get_format_description())
227
228
 
228
229
 
229
230
class RevisionGistImportTests(tests.TestCaseWithTransport):
237
238
        self.bzr_tree = self.make_branch_and_tree("bzr")
238
239
 
239
240
    def get_inter(self):
240
 
        return InterRepository.get(self.bzr_tree.branch.repository, 
 
241
        return InterRepository.get(self.bzr_tree.branch.repository,
241
242
                                   self.git_repo)
242
243
 
243
244
    def object_iter(self):
258
259
 
259
260
    def test_pointless(self):
260
261
        revid = self.bzr_tree.commit("pointless", timestamp=1205433193,
261
 
                timezone=0,
262
 
                  committer="Jelmer Vernooij <jelmer@samba.org>")
263
 
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
 
262
                timezone=0, committer="Jelmer Vernooij <jelmer@samba.org>")
 
263
        self.assertEqual(b"2caa8094a5b794961cd9bf582e3e2bb090db0b14",
264
264
                self.import_rev(revid))
265
 
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
 
265
        self.assertEqual(b"2caa8094a5b794961cd9bf582e3e2bb090db0b14",
266
266
                self.import_rev(revid))
267
267
 
268
268