/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

Fix RevisionTree.get_file_text().

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
 
import os
20
 
 
21
19
from bzrlib.tests import KnownFailure
22
20
from bzrlib.tests.blackbox import ExternalBase
23
21
 
24
22
from bzrlib.plugins.git import (
 
23
    ids,
25
24
    tests,
26
25
    )
27
26
 
42
41
        self.assertEqual(error, '')
43
42
        self.assertTrue("Repository branch (format: git)" in output)
44
43
 
45
 
    def test_branch(self):
46
 
        os.mkdir("gitbranch")
47
 
        os.chdir("gitbranch")
48
 
        tests.run_git('init')
49
 
        builder = tests.GitBranchBuilder()
50
 
        builder.set_file('a', 'text for a\n', False)
51
 
        builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
52
 
        builder.finish()
53
 
 
54
 
        os.chdir("..")
55
 
        output, error = self.run_bzr(['branch', 'gitbranch', 'bzrbranch'])
56
 
        self.assertEqual(error, 'Branched 1 revision(s).\n')
57
 
 
58
 
    def test_branch_ls(self):
 
44
    def test_ls(self):
59
45
        self.simple_commit()
60
 
        output, error = self.run_bzr(['ls', '-r-1'])
 
46
        output, error = self.run_bzr(['ls'])
61
47
        self.assertEqual(error, '')
62
48
        self.assertEqual(output, "a\n")
63
49
 
64
 
    def test_init(self):
65
 
        self.run_bzr("init-repo --git repo") 
66
 
 
67
50
    def test_info_verbose(self):
68
51
        self.simple_commit()
69
52
 
70
53
        output, error = self.run_bzr(['info', '-v'])
71
54
        self.assertEqual(error, '')
72
 
        self.assertTrue("Repository tree (format: git)" in output)
 
55
        self.assertTrue("Repository branch (format: git)" in output)
73
56
        self.assertTrue("control: Local Git Repository" in output)
74
57
        self.assertTrue("branch: Git Branch" in output)
75
58
        self.assertTrue("repository: Git Repository" in output)
102
85
        self.assertEquals(output, "foo                  1\n")
103
86
 
104
87
    def test_tag(self):
 
88
        raise KnownFailure("setting tags not supported by git-python yet")
105
89
        self.simple_commit()
106
90
 
107
91
        output, error = self.run_bzr(["tag", "bar"])
108
92
 
109
93
        self.assertEquals(error, '')
110
 
        self.assertEquals(output, 'Created tag bar.\n')
 
94
        self.assertEquals(output, '')
111
95