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

Fix bugs in two lookup_tree_id implementations and add a test for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_dir.py
16
16
 
17
17
"""Test the GitDir class"""
18
18
 
19
 
from dulwich.repo import Repo as GitRepo
20
 
 
21
19
from bzrlib import (
22
20
    bzrdir,
23
21
    errors,
33
31
 
34
32
class TestGitDir(tests.TestCaseInTempDir):
35
33
 
 
34
    _test_needs_features = [tests.GitCommandFeature]
 
35
 
36
36
    def test_open_existing(self):
37
 
        GitRepo.init(".")
 
37
        tests.run_git('init')
38
38
 
39
39
        gd = bzrdir.BzrDir.open('.')
40
40
        self.assertIsInstance(gd, dir.LocalGitDir)
41
41
 
42
42
    def test_open_workingtree(self):
43
 
        GitRepo.init(".")
 
43
        tests.run_git('init')
44
44
 
45
45
        gd = bzrdir.BzrDir.open('.')
46
46
        raise TestSkipped
48
48
        self.assertIsInstance(wt, workingtree.GitWorkingTree)
49
49
 
50
50
    def test_open_workingtree_bare(self):
51
 
        GitRepo.init_bare(".")
 
51
        tests.run_git('--bare', 'init')
52
52
 
53
53
        gd = bzrdir.BzrDir.open('.')
54
54
        self.assertRaises(errors.NoWorkingTree, gd.open_workingtree)
55
55
 
56
56
 
57
 
class TestGitDirFormat(tests.TestCase):
 
57
class TestGitDirFormat(tests.TestCaseInTempDir):
 
58
 
 
59
    _test_needs_features = [tests.GitCommandFeature]
58
60
 
59
61
    def setUp(self):
60
62
        super(TestGitDirFormat, self).setUp()
61
 
        self.format = dir.LocalGitControlDirFormat()
 
63
        self.format = dir.LocalGitBzrDirFormat()
62
64
 
63
65
    def test_get_format_description(self):
64
66
        self.assertEquals("Local Git Repository",
65
67
                          self.format.get_format_description())
66
68
 
67
 
    def test_eq(self):
68
 
        format2 = dir.LocalGitControlDirFormat()
69
 
        self.assertEquals(self.format, format2)
70
 
        self.assertEquals(self.format, self.format)
71
 
        bzr_format = bzrdir.format_registry.make_bzrdir("default")
72
 
        self.assertNotEquals(self.format, bzr_format)
73