/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_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-03 01:42:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180703014253-zjckmhgnmb2qsn6x
Disable some flaky tests on python3, allow running without fastimport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_branch.py
67
67
        GitRepo.init('.')
68
68
        url = "%s,ref=%s" % (
69
69
            urlutils.local_path_to_url(self.test_dir),
70
 
            urllib.quote("refs/remotes/origin/unstable", safe='')
 
70
            urlutils.quote("refs/remotes/origin/unstable", safe='')
71
71
            )
72
72
        d = ControlDir.open(url)
73
73
        b = d.create_branch()
100
100
        r = GitRepo.init('.')
101
101
        self.build_tree(['a'])
102
102
        r.stage(["a"])
103
 
        return r.do_commit("a", committer=b"Somebody <foo@example.com>")
 
103
        return r.do_commit(b"a", committer=b"Somebody <foo@example.com>")
104
104
 
105
105
    def test_last_revision_is_valid(self):
106
106
        head = self.simple_commit_a()
113
113
        self.build_tree(['b'])
114
114
        r = GitRepo(".")
115
115
        r.stage("b")
116
 
        revb = r.do_commit("b", committer=b"Somebody <foo@example.com>")
 
116
        revb = r.do_commit(b"b", committer=b"Somebody <foo@example.com>")
117
117
 
118
118
        thebranch = Branch.open('.')
119
119
        self.assertEqual((2, default_mapping.revision_id_foreign_to_bzr(revb)), thebranch.last_revision_info())
121
121
    def test_tag_annotated(self):
122
122
        reva = self.simple_commit_a()
123
123
        o = Tag()
124
 
        o.name = "foo"
125
 
        o.tagger = "Jelmer <foo@example.com>"
126
 
        o.message = "add tag"
 
124
        o.name = b"foo"
 
125
        o.tagger = b"Jelmer <foo@example.com>"
 
126
        o.message = b"add tag"
127
127
        o.object = (Commit, reva)
128
128
        o.tag_timezone = 0
129
129
        o.tag_time = 42
130
130
        r = GitRepo(".")
131
131
        r.object_store.add_object(o)
132
 
        r['refs/tags/foo'] = o.id
 
132
        r[b'refs/tags/foo'] = o.id
133
133
        thebranch = Branch.open('.')
134
134
        self.assertEqual({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
135
135
                          thebranch.tags.get_tag_dict())
137
137
    def test_tag(self):
138
138
        reva = self.simple_commit_a()
139
139
        r = GitRepo(".")
140
 
        r.refs["refs/tags/foo"] = reva
 
140
        r.refs[b"refs/tags/foo"] = reva
141
141
        thebranch = Branch.open('.')
142
142
        self.assertEqual({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
143
143
                          thebranch.tags.get_tag_dict())
186
186
        os.chdir("d")
187
187
        GitRepo.init('.')
188
188
        bb = tests.GitBranchBuilder()
189
 
        bb.set_file("foobar", "foo\nbar\n", False)
190
 
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
189
        bb.set_file("foobar", b"foo\nbar\n", False)
 
190
        mark = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
191
191
        gitsha = bb.finish()[mark]
192
192
        os.chdir("..")
193
193
        return os.path.abspath("d"), gitsha
197
197
        os.chdir("d")
198
198
        GitRepo.init('.')
199
199
        bb = tests.GitBranchBuilder()
200
 
        bb.set_file("foobar", "foo\nbar\n", False)
201
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
202
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
200
        bb.set_file("foobar", b"foo\nbar\n", False)
 
201
        mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
 
202
        mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
203
203
        marks = bb.finish()
204
204
        os.chdir("..")
205
205
        return "d", (marks[mark1], marks[mark2])
213
213
        path, gitsha = self.make_onerev_branch()
214
214
        oldrepo = Repository.open(path)
215
215
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
216
 
        self.assertEqual(gitsha, oldrepo._git.get_refs()["refs/heads/master"])
 
216
        self.assertEqual(gitsha, oldrepo._git.get_refs()[b"refs/heads/master"])
217
217
        newbranch = self.clone_git_branch(path, "f")
218
218
        self.assertEqual([revid], newbranch.repository.all_revision_ids())
219
219
 
220
220
    def test_sprouted_tags(self):
221
221
        path, gitsha = self.make_onerev_branch()
222
222
        r = GitRepo(path)
223
 
        r.refs["refs/tags/lala"] = r.head()
 
223
        r.refs[b"refs/tags/lala"] = r.head()
224
224
        oldrepo = Repository.open(path)
225
225
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
226
226
        newbranch = self.clone_git_branch(path, "f")
259
259
    def test_interbranch_pull_with_tags(self):
260
260
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
261
261
        gitrepo = GitRepo(path)
262
 
        gitrepo.refs["refs/tags/sometag"] = gitsha2
 
262
        gitrepo.refs[b"refs/tags/sometag"] = gitsha2
263
263
        oldrepo = Repository.open(path)
264
264
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
265
265
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)