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

Add more tests, simplify push code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
26
26
import os
27
27
 
28
28
from bzrlib import (
 
29
    errors,
29
30
    revision,
30
31
    )
31
32
from bzrlib.branch import (
32
33
    Branch,
 
34
    InterBranch,
33
35
    )
34
36
from bzrlib.bzrdir import (
35
37
    BzrDir,
39
41
    )
40
42
 
41
43
from bzrlib.plugins.git import (
 
44
    LocalGitBzrDirFormat,
42
45
    branch,
43
46
    tests,
44
47
    )
45
 
from bzrlib.plugins.git.mapping import default_mapping
 
48
from bzrlib.plugins.git.mapping import (
 
49
    default_mapping,
 
50
    )
46
51
 
47
52
 
48
53
class TestGitBranch(tests.TestCaseInTempDir):
51
56
 
52
57
    def test_open_existing(self):
53
58
        GitRepo.init('.')
54
 
 
55
 
        thebranch = Branch.open('.')
 
59
        d = BzrDir.open('.')
 
60
        thebranch = d.create_branch()
56
61
        self.assertIsInstance(thebranch, branch.GitBranch)
57
62
 
58
63
    def test_repr(self):
59
64
        GitRepo.init('.')
60
 
        thebranch = Branch.open('.')
61
 
        self.assertEquals("LocalGitBranch('file://%s/', 'HEAD')" % self.test_dir, repr(thebranch))
 
65
        d = BzrDir.open('.')
 
66
        thebranch = d.create_branch()
 
67
        self.assertEquals("<LocalGitBranch('file://%s/', 'HEAD')>" % self.test_dir, repr(thebranch))
62
68
 
63
69
    def test_last_revision_is_null(self):
64
70
        GitRepo.init('.')
65
 
 
66
 
        thebranch = Branch.open('.')
 
71
        thedir = BzrDir.open('.')
 
72
        thebranch = thedir.create_branch()
67
73
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
68
74
        self.assertEqual((0, revision.NULL_REVISION),
69
75
                         thebranch.last_revision_info())
77
83
    def test_last_revision_is_valid(self):
78
84
        self.simple_commit_a()
79
85
        head = tests.run_git('rev-parse', 'HEAD').strip()
80
 
 
81
86
        thebranch = Branch.open('.')
82
87
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
83
88
                         thebranch.last_revision())
110
115
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
111
116
                          thebranch.tags.get_tag_dict())
112
117
 
113
 
        
 
118
 
114
119
 
115
120
class TestWithGitBranch(tests.TestCaseWithTransport):
116
121
 
117
122
    def setUp(self):
118
123
        tests.TestCaseWithTransport.setUp(self)
119
124
        dulwich.repo.Repo.create(self.test_dir)
120
 
        self.git_branch = Branch.open(self.test_dir)
 
125
        d = BzrDir.open(self.test_dir)
 
126
        self.git_branch = d.create_branch()
121
127
 
122
128
    def test_get_parent(self):
123
129
        self.assertIs(None, self.git_branch.get_parent())
124
130
 
125
131
    def test_get_stacked_on_url(self):
126
 
        self.assertIs(None, self.git_branch.get_stacked_on_url())
 
132
        self.assertRaises(errors.UnstackableBranchFormat,
 
133
            self.git_branch.get_stacked_on_url)
127
134
 
128
135
    def test_get_physical_lock_status(self):
129
136
        self.assertFalse(self.git_branch.get_physical_lock_status())
138
145
    def test_get_format_description(self):
139
146
        self.assertEquals("Git Branch", self.format.get_format_description())
140
147
 
 
148
    def test_get_network_name(self):
 
149
        self.assertEquals("git", self.format.network_name())
 
150
 
 
151
    def test_supports_tags(self):
 
152
        self.assertTrue(self.format.supports_tags())
141
153
 
142
154
 
143
155
class BranchTests(tests.TestCaseInTempDir):
153
165
        os.chdir("..")
154
166
        return "d", gitsha
155
167
 
 
168
    def make_tworev_branch(self):
 
169
        os.mkdir("d")
 
170
        os.chdir("d")
 
171
        GitRepo.init('.')
 
172
        bb = tests.GitBranchBuilder()
 
173
        bb.set_file("foobar", "foo\nbar\n", False)
 
174
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
175
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
176
        marks = bb.finish()
 
177
        os.chdir("..")
 
178
        return "d", (marks[mark1], marks[mark2])
 
179
 
156
180
    def clone_git_branch(self, from_url, to_url):
157
181
        from_dir = BzrDir.open(from_url)
158
182
        to_dir = from_dir.sprout(to_url)
175
199
        newbranch = self.clone_git_branch(path, "f")
176
200
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
177
201
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
 
202
 
 
203
    def test_interbranch_pull(self):
 
204
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
205
        oldrepo = Repository.open(path)
 
206
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
207
        newbranch = self.make_branch('g')
 
208
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
209
        inter_branch.pull()
 
210
        self.assertEquals(revid2, newbranch.last_revision())
 
211
 
 
212
    def test_interbranch_pull_noop(self):
 
213
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
214
        oldrepo = Repository.open(path)
 
215
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
216
        newbranch = self.make_branch('g')
 
217
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
218
        inter_branch.pull()
 
219
        # This is basically "assertNotRaises"
 
220
        inter_branch.pull()
 
221
        self.assertEquals(revid2, newbranch.last_revision())
 
222
 
 
223
    def test_interbranch_pull_stop_revision(self):
 
224
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
225
        oldrepo = Repository.open(path)
 
226
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
227
        newbranch = self.make_branch('g')
 
228
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
229
        inter_branch.pull(stop_revision=revid1)
 
230
        self.assertEquals(revid1, newbranch.last_revision())
 
231
 
 
232
    def test_interbranch_limited_pull(self):
 
233
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
234
        oldrepo = Repository.open(path)
 
235
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
236
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
237
        newbranch = self.make_branch('g')
 
238
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
239
        inter_branch.pull(limit=1)
 
240
        self.assertEquals(revid1, newbranch.last_revision())
 
241
        inter_branch.pull(limit=1)
 
242
        self.assertEquals(revid2, newbranch.last_revision())
 
243
 
 
244
 
 
245
class ForeignTestsBranchFactory(object):
 
246
 
 
247
    def make_empty_branch(self, transport):
 
248
        d = LocalGitBzrDirFormat().initialize_on_transport(transport)
 
249
        return d.create_branch()
 
250
 
 
251
    make_branch = make_empty_branch
 
252
 
 
253
 
 
254