/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

Merge in dulwich.

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 bzrlib import (
20
 
    bzrdir,
21
 
    errors,
22
 
    )
23
 
from bzrlib.tests import TestSkipped
 
19
from bzrlib import bzrdir, errors
24
20
 
25
 
from bzrlib.plugins.git import (
26
 
    dir,
27
 
    tests,
28
 
    workingtree,
29
 
    )
 
21
from bzrlib.plugins.git import dir, tests, workingtree
30
22
 
31
23
 
32
24
class TestGitDir(tests.TestCaseInTempDir):
37
29
        tests.run_git('init')
38
30
 
39
31
        gd = bzrdir.BzrDir.open('.')
40
 
        self.assertIsInstance(gd, dir.LocalGitDir)
 
32
        self.assertIsInstance(gd, dir.GitDir)
41
33
 
42
34
    def test_open_workingtree(self):
43
35
        tests.run_git('init')
44
36
 
45
37
        gd = bzrdir.BzrDir.open('.')
46
 
        raise TestSkipped
47
38
        wt = gd.open_workingtree()
48
39
        self.assertIsInstance(wt, workingtree.GitWorkingTree)
49
40
 
60
51
 
61
52
    def setUp(self):
62
53
        super(TestGitDirFormat, self).setUp()
63
 
        self.format = dir.LocalGitBzrDirFormat()
 
54
        self.format = dir.GitBzrDirFormat()
64
55
 
65
56
    def test_get_format_description(self):
66
57
        self.assertEquals("Local Git Repository",