1
# Copyright (C) 2007 David Allouche <ddaa@ddaa.net>
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Black-box tests for bzr-git."""
19
from dulwich.repo import (
25
from bzrlib.branch import Branch
27
version_info as bzrlib_version,
29
from bzrlib.bzrdir import (
33
from bzrlib.tests.blackbox import ExternalBase
35
from bzrlib.plugins.git import (
40
class TestGitBlackBox(ExternalBase):
42
def simple_commit(self):
43
# Create a git repository with a revision.
44
repo = GitRepo.init(self.test_dir)
45
builder = tests.GitBranchBuilder()
46
builder.set_file('a', 'text for a\n', False)
47
r1 = builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
48
return repo, builder.finish()[r1]
51
GitRepo.init(self.test_dir)
52
dir = BzrDir.open(self.test_dir)
54
output, error = self.run_bzr(['nick'])
55
self.assertEquals("master\n", output)
59
output, error = self.run_bzr(['info'])
60
self.assertEqual(error, '')
61
self.assertTrue("Standalone tree (format: git)" in output)
63
def test_branch(self):
65
GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
67
builder = tests.GitBranchBuilder()
68
builder.set_file('a', 'text for a\n', False)
69
builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
73
output, error = self.run_bzr(['branch', 'gitbranch', 'bzrbranch'])
75
(error == 'Branched 1 revision(s).\n') or
76
(error == 'Branched 1 revision.\n'),
79
def test_checkout(self):
81
GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
83
builder = tests.GitBranchBuilder()
84
builder.set_file('a', 'text for a\n', False)
85
builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
89
output, error = self.run_bzr(['checkout', 'gitbranch', 'bzrbranch'])
90
self.assertEqual(error, '')
91
self.assertEqual(output, '')
93
def test_branch_ls(self):
95
output, error = self.run_bzr(['ls', '-r-1'])
96
self.assertEqual(error, '')
97
self.assertEqual(output, "a\n")
100
self.run_bzr("init --git repo")
102
def test_info_verbose(self):
105
if bzrlib_version < (2, 4):
106
self.knownFailure("bzr info uses inventory on bzr < 2.4")
108
output, error = self.run_bzr(['info', '-v'])
109
self.assertEqual(error, '')
110
self.assertTrue("Standalone tree (format: git)" in output)
111
self.assertTrue("control: Local Git Repository" in output)
112
self.assertTrue("branch: Git Branch" in output)
113
self.assertTrue("repository: Git Repository" in output)
115
def test_push_roundtripping(self):
116
self.knownFailure("roundtripping is not yet supported")
117
self.with_roundtripping()
119
GitRepo.init(os.path.join(self.test_dir, "bla"))
120
self.run_bzr(['init', 'foo'])
121
self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
122
# when roundtripping is supported
123
output, error = self.run_bzr(['push', '-d', 'foo', 'bla'])
124
self.assertEquals("", output)
125
self.assertTrue(error.endswith("Created new branch.\n"))
128
# Smoke test for "bzr log" in a git repository.
131
# Check that bzr log does not fail and includes the revision.
132
output, error = self.run_bzr(['log'])
133
self.assertEqual(error, '')
135
'<The commit message>' in output,
136
"Commit message was not found in output:\n%s" % (output,))
138
def test_log_verbose(self):
139
# Smoke test for "bzr log -v" in a git repository.
142
# Check that bzr log does not fail and includes the revision.
143
output, error = self.run_bzr(['log', '-v'])
146
git_repo, commit_sha1 = self.simple_commit()
147
git_repo.refs["refs/tags/foo"] = commit_sha1
149
output, error = self.run_bzr(['tags'])
150
self.assertEquals(error, '')
151
self.assertEquals(output, "foo 1\n")
156
output, error = self.run_bzr(["tag", "bar"])
158
# bzr <= 2.2 emits this message in the output stream
159
# bzr => 2.3 emits this message in the error stream
160
self.assertEquals(error + output, 'Created tag bar.\n')
162
def test_init_repo(self):
163
output, error = self.run_bzr(["init", "--git", "bla.git"])
164
self.assertEquals(error, '')
165
self.assertEquals(output, 'Created a standalone tree (format: git)\n')
167
def test_diff_format(self):
168
tree = self.make_branch_and_tree('.')
169
self.build_tree(['a'])
171
output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
172
self.assertEqual(error, '')
173
self.assertEqual(output,
174
'diff --git /dev/null b/a\n'
177
'index 0000000..c197bd8 100644\n'
183
def test_git_import(self):
184
r = GitRepo.init("a", mkdir=True)
185
self.build_tree(["a/file"])
187
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
188
r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
189
self.run_bzr(["git-import", "a", "b"])
190
self.assertEquals(set(["abranch", "bbranch", ".bzr"]),
191
set(os.listdir("b")))
193
def test_git_import_incremental(self):
194
r = GitRepo.init("a", mkdir=True)
195
self.build_tree(["a/file"])
197
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
198
self.run_bzr(["git-import", "a", "b"])
199
self.run_bzr(["git-import", "a", "b"])
200
self.assertEquals(set(["abranch", ".bzr"]), set(os.listdir("b")))
202
def test_git_import_tags(self):
203
r = GitRepo.init("a", mkdir=True)
204
self.build_tree(["a/file"])
206
cid = r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
207
r["refs/tags/atag"] = cid
208
self.run_bzr(["git-import", "a", "b"])
209
self.assertEquals(set(["abranch", ".bzr"]), set(os.listdir("b")))
210
b = Branch.open("b/abranch")
211
self.assertEquals(["atag"], b.tags.get_tag_dict().keys())
213
def test_git_import_colo(self):
214
r = GitRepo.init("a", mkdir=True)
215
self.build_tree(["a/file"])
217
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
218
r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
219
self.make_bzrdir("b", format="development-colo")
220
self.run_bzr(["git-import", "a", "b"])
222
[b.name for b in BzrDir.open("b").list_branches()],
223
["abranch", "bbranch"])
added
removed
tests/test_blackbox.py
