/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
1
# Copyright (C) 2007 David Allouche <ddaa@ddaa.net>
2
#
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.
7
#
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.
12
#
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
16
17
"""Black-box tests for bzr-git."""
18
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
19
from dulwich.repo import (
20
    Repo as GitRepo,
21
    )
22
0.200.89 by Jelmer Vernooij
Support sprouting branches.
23
import os
24
0.200.1451 by Jelmer Vernooij
Add some more tests for git-import.
25
from bzrlib.branch import Branch
0.200.1267 by Jelmer Vernooij
Disable test on 2.3 which is known failing.
26
from bzrlib import (
27
    version_info as bzrlib_version,
28
    )
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
29
from bzrlib.bzrdir import (
30
    BzrDir,
31
    )
0.200.1461 by Jelmer Vernooij
Fix testsuite on bzr 2.4.
32
from bzrlib.tests import TestSkipped
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
33
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
34
from bzrlib.tests.blackbox import ExternalBase
35
36
from bzrlib.plugins.git import (
37
    tests,
38
    )
39
40
41
class TestGitBlackBox(ExternalBase):
42
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
43
    def simple_commit(self):
44
        # Create a git repository with a revision.
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
45
        repo = GitRepo.init(self.test_dir)
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
46
        builder = tests.GitBranchBuilder()
47
        builder.set_file('a', 'text for a\n', False)
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
48
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
49
        return repo, builder.finish()[r1]
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
50
0.200.294 by Jelmer Vernooij
Add test for nick.
51
    def test_nick(self):
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
52
        GitRepo.init(self.test_dir)
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
53
        dir = BzrDir.open(self.test_dir)
54
        dir.create_branch()
0.200.294 by Jelmer Vernooij
Add test for nick.
55
        output, error = self.run_bzr(['nick'])
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
56
        self.assertEquals("master\n", output)
0.200.294 by Jelmer Vernooij
Add test for nick.
57
0.200.68 by Jelmer Vernooij
Add blackbox test for info.
58
    def test_info(self):
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
59
        self.simple_commit()
0.200.68 by Jelmer Vernooij
Add blackbox test for info.
60
        output, error = self.run_bzr(['info'])
61
        self.assertEqual(error, '')
0.200.920 by Jelmer Vernooij
Fix some more tests.
62
        self.assertTrue("Standalone tree (format: git)" in output)
0.200.68 by Jelmer Vernooij
Add blackbox test for info.
63
0.200.89 by Jelmer Vernooij
Support sprouting branches.
64
    def test_branch(self):
65
        os.mkdir("gitbranch")
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
66
        GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
67
        os.chdir('gitbranch')
0.200.89 by Jelmer Vernooij
Support sprouting branches.
68
        builder = tests.GitBranchBuilder()
69
        builder.set_file('a', 'text for a\n', False)
70
        builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
71
        builder.finish()
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
72
        os.chdir('..')
0.200.89 by Jelmer Vernooij
Support sprouting branches.
73
74
        output, error = self.run_bzr(['branch', 'gitbranch', 'bzrbranch'])
0.200.1382 by Jelmer Vernooij
Fix test after i18n fixes in bzr.dev.
75
        self.assertTrue(
76
            (error == 'Branched 1 revision(s).\n') or
77
            (error == 'Branched 1 revision.\n'),
78
            error)
0.200.89 by Jelmer Vernooij
Support sprouting branches.
79
0.200.1151 by Jelmer Vernooij
Update NEWS, add test for bug fixed earlier.
80
    def test_checkout(self):
81
        os.mkdir("gitbranch")
82
        GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
83
        os.chdir('gitbranch')
84
        builder = tests.GitBranchBuilder()
85
        builder.set_file('a', 'text for a\n', False)
86
        builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
87
        builder.finish()
88
        os.chdir('..')
89
90
        output, error = self.run_bzr(['checkout', 'gitbranch', 'bzrbranch'])
91
        self.assertEqual(error, '')
92
        self.assertEqual(output, '')
93
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
94
    def test_branch_ls(self):
0.200.78 by Jelmer Vernooij
Add blackbox test for ls.
95
        self.simple_commit()
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
96
        output, error = self.run_bzr(['ls', '-r-1'])
0.200.78 by Jelmer Vernooij
Add blackbox test for ls.
97
        self.assertEqual(error, '')
98
        self.assertEqual(output, "a\n")
99
0.200.108 by Jelmer Vernooij
Support bzr init --git.
100
    def test_init(self):
0.200.1267 by Jelmer Vernooij
Disable test on 2.3 which is known failing.
101
        self.run_bzr("init --git repo")
0.200.108 by Jelmer Vernooij
Support bzr init --git.
102
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
103
    def test_info_verbose(self):
104
        self.simple_commit()
105
0.200.1267 by Jelmer Vernooij
Disable test on 2.3 which is known failing.
106
        if bzrlib_version < (2, 4):
0.267.1 by Martin
Don't raise the deprecated KnownFailure from tests
107
            self.knownFailure("bzr info uses inventory on bzr < 2.4")
0.200.1267 by Jelmer Vernooij
Disable test on 2.3 which is known failing.
108
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
109
        output, error = self.run_bzr(['info', '-v'])
110
        self.assertEqual(error, '')
0.200.920 by Jelmer Vernooij
Fix some more tests.
111
        self.assertTrue("Standalone tree (format: git)" in output)
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
112
        self.assertTrue("control: Local Git Repository" in output)
113
        self.assertTrue("branch: Git Branch" in output)
114
        self.assertTrue("repository: Git Repository" in output)
115
0.200.1325 by Jelmer Vernooij
More test fixes.
116
    def test_push_roundtripping(self):
0.267.1 by Martin
Don't raise the deprecated KnownFailure from tests
117
        self.knownFailure("roundtripping is not yet supported")
0.200.1325 by Jelmer Vernooij
More test fixes.
118
        self.with_roundtripping()
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
119
        os.mkdir("bla")
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
120
        GitRepo.init(os.path.join(self.test_dir, "bla"))
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
121
        self.run_bzr(['init', 'foo'])
122
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
0.200.1156 by Jelmer Vernooij
Disable push.
123
        # when roundtripping is supported
0.252.12 by Jelmer Vernooij
Fix push blackbox test.
124
        output, error = self.run_bzr(['push', '-d', 'foo', 'bla'])
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
125
        self.assertEquals("", output)
0.252.12 by Jelmer Vernooij
Fix push blackbox test.
126
        self.assertTrue(error.endswith("Created new branch.\n"))
0.200.291 by Jelmer Vernooij
Print proper error about not supporting push.
127
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
128
    def test_log(self):
129
        # Smoke test for "bzr log" in a git repository.
0.200.76 by Jelmer Vernooij
Add blackbox test for info -v
130
        self.simple_commit()
0.200.39 by David Allouche
Black-box text for "bzr log" in a git tree. Further simplification of GitRevisionTree.
131
132
        # Check that bzr log does not fail and includes the revision.
133
        output, error = self.run_bzr(['log'])
134
        self.assertEqual(error, '')
135
        self.assertTrue(
136
            '<The commit message>' in output,
137
            "Commit message was not found in output:\n%s" % (output,))
0.200.80 by Jelmer Vernooij
Add blackbox test for bzr log -v.
138
139
    def test_log_verbose(self):
140
        # Smoke test for "bzr log -v" in a git repository.
141
        self.simple_commit()
142
143
        # Check that bzr log does not fail and includes the revision.
144
        output, error = self.run_bzr(['log', '-v'])
145
 
0.200.83 by Jelmer Vernooij
Add blackbox test for 'bzr tags'
146
    def test_tags(self):
0.200.444 by Jelmer Vernooij
Stop running git in blackbox tests.
147
        git_repo, commit_sha1 = self.simple_commit()
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
148
        git_repo.refs["refs/tags/foo"] = commit_sha1
0.200.83 by Jelmer Vernooij
Add blackbox test for 'bzr tags'
149
150
        output, error = self.run_bzr(['tags'])
151
        self.assertEquals(error, '')
152
        self.assertEquals(output, "foo                  1\n")
153
0.200.85 by Jelmer Vernooij
Add test for creating new tags.
154
    def test_tag(self):
155
        self.simple_commit()
156
157
        output, error = self.run_bzr(["tag", "bar"])
158
0.258.1 by Max Bowsher
Make tests tolerant to bzr <= 2.2.
159
        # bzr <= 2.2 emits this message in the output stream
160
        # bzr => 2.3 emits this message in the error stream
161
        self.assertEquals(error + output, 'Created tag bar.\n')
0.200.85 by Jelmer Vernooij
Add test for creating new tags.
162
0.200.288 by Jelmer Vernooij
Add test for init-repo.
163
    def test_init_repo(self):
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
164
        output, error = self.run_bzr(["init", "--git", "bla.git"])
0.200.288 by Jelmer Vernooij
Add test for init-repo.
165
        self.assertEquals(error, '')
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
166
        self.assertEquals(output, 'Created a standalone tree (format: git)\n')
0.200.288 by Jelmer Vernooij
Add test for init-repo.
167
0.200.1332 by Jelmer Vernooij
Add smoke test for 'bzr diff --format=git'.
168
    def test_diff_format(self):
169
        tree = self.make_branch_and_tree('.')
170
        self.build_tree(['a'])
171
        tree.add(['a'])
172
        output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
173
        self.assertEqual(error, '')
174
        self.assertEqual(output,
175
            'diff --git /dev/null b/a\n'
176
            'old mode 0\n'
177
            'new mode 100644\n'
178
            'index 0000000..c197bd8 100644\n'
179
            '--- /dev/null\n'
180
            '+++ b/a\n'
181
            '@@ -1,0 +1,1 @@\n'
182
            '+contents of a\n')
0.200.1450 by Jelmer Vernooij
Fix git-import after branch refactoring.
183
184
    def test_git_import(self):
185
        r = GitRepo.init("a", mkdir=True)
186
        self.build_tree(["a/file"])
187
        r.stage("file")
188
        r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
189
        r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
190
        self.run_bzr(["git-import", "a", "b"])
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
191
        self.assertEquals(set(["abranch", "bbranch", ".bzr"]),
192
                set(os.listdir("b")))
0.200.1451 by Jelmer Vernooij
Add some more tests for git-import.
193
194
    def test_git_import_incremental(self):
195
        r = GitRepo.init("a", mkdir=True)
196
        self.build_tree(["a/file"])
197
        r.stage("file")
198
        r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
199
        self.run_bzr(["git-import", "a", "b"])
200
        self.run_bzr(["git-import", "a", "b"])
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
201
        self.assertEquals(set(["abranch", ".bzr"]), set(os.listdir("b")))
0.200.1451 by Jelmer Vernooij
Add some more tests for git-import.
202
203
    def test_git_import_tags(self):
204
        r = GitRepo.init("a", mkdir=True)
205
        self.build_tree(["a/file"])
206
        r.stage("file")
207
        cid = r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
208
        r["refs/tags/atag"] = cid
209
        self.run_bzr(["git-import", "a", "b"])
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
210
        self.assertEquals(set(["abranch", ".bzr"]), set(os.listdir("b")))
211
        b = Branch.open("b/abranch")
0.200.1451 by Jelmer Vernooij
Add some more tests for git-import.
212
        self.assertEquals(["atag"], b.tags.get_tag_dict().keys())
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
213
214
    def test_git_import_colo(self):
0.200.1461 by Jelmer Vernooij
Fix testsuite on bzr 2.4.
215
        if bzrlib_version < (2, 5, 0):
216
            raise TestSkipped("colocated branches not supported with bzr < 2.5")
0.200.1452 by Jelmer Vernooij
Support colocated branches in 'bzr git-import', flatten namespace.
217
        r = GitRepo.init("a", mkdir=True)
218
        self.build_tree(["a/file"])
219
        r.stage("file")
220
        r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
221
        r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
222
        self.make_bzrdir("b", format="development-colo")
223
        self.run_bzr(["git-import", "a", "b"])
224
        self.assertEquals(
225
            [b.name for b in BzrDir.open("b").list_branches()],
226
            ["abranch", "bbranch"])