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

Support sprouting branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_blackbox.py
16
16
 
17
17
"""Black-box tests for bzr-git."""
18
18
 
19
 
from dulwich.repo import (
20
 
    Repo as GitRepo,
21
 
    )
22
 
 
23
19
import os
24
20
 
25
21
from bzrlib.tests import KnownFailure
26
22
from bzrlib.tests.blackbox import ExternalBase
27
23
 
28
24
from bzrlib.plugins.git import (
 
25
    ids,
29
26
    tests,
30
27
    )
31
28
 
34
31
 
35
32
    def simple_commit(self):
36
33
        # Create a git repository with a revision.
37
 
        repo = GitRepo.init(self.test_dir)
 
34
        tests.run_git('init')
38
35
        builder = tests.GitBranchBuilder()
39
36
        builder.set_file('a', 'text for a\n', False)
40
 
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
41
 
        return repo, builder.finish()[r1]
42
 
 
43
 
    def test_nick(self):
44
 
        GitRepo.init(self.test_dir)
45
 
        output, error = self.run_bzr(['nick'])
46
 
        self.assertEquals("HEAD\n", output)
 
37
        builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
 
38
        builder.finish()
47
39
 
48
40
    def test_info(self):
49
41
        self.simple_commit()
53
45
 
54
46
    def test_branch(self):
55
47
        os.mkdir("gitbranch")
56
 
        GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
57
 
        os.chdir('gitbranch')
 
48
        os.chdir("gitbranch")
 
49
        tests.run_git('init')
58
50
        builder = tests.GitBranchBuilder()
59
51
        builder.set_file('a', 'text for a\n', False)
60
52
        builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
61
53
        builder.finish()
62
 
        os.chdir('..')
63
54
 
 
55
        os.chdir("..")
64
56
        output, error = self.run_bzr(['branch', 'gitbranch', 'bzrbranch'])
65
57
        self.assertEqual(error, 'Branched 1 revision(s).\n')
 
58
        self.assertEqual(output, '')
66
59
 
67
 
    def test_branch_ls(self):
 
60
    def test_ls(self):
68
61
        self.simple_commit()
69
 
        output, error = self.run_bzr(['ls', '-r-1'])
 
62
        output, error = self.run_bzr(['ls'])
70
63
        self.assertEqual(error, '')
71
64
        self.assertEqual(output, "a\n")
72
65
 
73
 
    def test_init(self):
74
 
        self.run_bzr("init-repo --git repo") 
75
 
 
76
66
    def test_info_verbose(self):
77
67
        self.simple_commit()
78
68
 
83
73
        self.assertTrue("branch: Git Branch" in output)
84
74
        self.assertTrue("repository: Git Repository" in output)
85
75
 
86
 
    def test_push(self):
87
 
        os.mkdir("bla")
88
 
        GitRepo.init(os.path.join(self.test_dir, "bla"))
89
 
        self.run_bzr(['init', 'foo'])
90
 
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
91
 
        output, error = self.run_bzr(['push', '-d', 'foo', 'bla'], retcode=3)
92
 
        self.assertEquals('bzr: ERROR: Push is not yet supported for bzr-git. Try dpush instead.\n', error)
93
 
        self.assertEquals("", output)
94
 
 
95
76
    def test_log(self):
96
77
        # Smoke test for "bzr log" in a git repository.
97
78
        self.simple_commit()
111
92
        output, error = self.run_bzr(['log', '-v'])
112
93
 
113
94
    def test_tags(self):
114
 
        git_repo, commit_sha1 = self.simple_commit()
115
 
        git_repo.refs["refs/tags/foo"] = commit_sha1
 
95
        self.simple_commit()
 
96
 
 
97
        tests.run_git("tag", "foo")
116
98
 
117
99
        output, error = self.run_bzr(['tags'])
118
100
        self.assertEquals(error, '')
119
101
        self.assertEquals(output, "foo                  1\n")
120
102
 
121
103
    def test_tag(self):
 
104
        raise KnownFailure("setting tags not supported by git-python yet")
122
105
        self.simple_commit()
123
106
 
124
107
        output, error = self.run_bzr(["tag", "bar"])
125
108
 
126
109
        self.assertEquals(error, '')
127
 
        self.assertEquals(output, 'Created tag bar.\n')
128
 
 
129
 
    def test_init_repo(self):
130
 
        output, error = self.run_bzr(["init-repo", "--git", "bla.git"])
131
 
        self.assertEquals(error, '')
132
 
        self.assertEquals(output, 'Repository branch (format: git)\nLocation:\n  shared repository: bla.git\n  repository branch: bla.git\n')
 
110
        self.assertEquals(output, '')
133
111