/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 breezy/git/tests/test_dir.py

  • Committer: Jelmer Vernooij
  • Date: 2019-01-01 21:08:01 UTC
  • mto: This revision was merged to the branch mainline in revision 7231.
  • Revision ID: jelmer@jelmer.uk-20190101210801-2dlsv7b1lvydmpkl
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
1
2
# Copyright (C) 2007 Canonical Ltd
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
12
13
#
13
14
# You should have received a copy of the GNU General Public License
14
15
# 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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17
 
17
18
"""Test the GitDir class"""
18
19
 
19
 
from bzrlib import bzrdir, errors
20
 
 
21
 
from bzrlib.plugins.git import dir, tests, workingtree
 
20
from __future__ import absolute_import
 
21
 
 
22
from dulwich.repo import Repo as GitRepo
 
23
import os
 
24
 
 
25
from ... import (
 
26
    controldir,
 
27
    errors,
 
28
    urlutils,
 
29
    )
 
30
from ...tests import TestSkipped
 
31
 
 
32
from .. import (
 
33
    dir,
 
34
    tests,
 
35
    workingtree,
 
36
    )
22
37
 
23
38
 
24
39
class TestGitDir(tests.TestCaseInTempDir):
25
40
 
26
 
    _test_needs_features = [tests.GitCommandFeature]
 
41
    def test_get_head_branch_reference(self):
 
42
        GitRepo.init(".")
 
43
 
 
44
        gd = controldir.ControlDir.open('.')
 
45
        self.assertEqual(
 
46
            "%s,branch=master" %
 
47
            urlutils.local_path_to_url(os.path.abspath(".")),
 
48
            gd.get_branch_reference())
27
49
 
28
50
    def test_open_existing(self):
29
 
        tests.run_git('init')
 
51
        GitRepo.init(".")
30
52
 
31
 
        gd = bzrdir.BzrDir.open('.')
 
53
        gd = controldir.ControlDir.open('.')
32
54
        self.assertIsInstance(gd, dir.LocalGitDir)
33
55
 
34
56
    def test_open_workingtree(self):
35
 
        tests.run_git('init')
 
57
        GitRepo.init(".")
36
58
 
37
 
        gd = bzrdir.BzrDir.open('.')
 
59
        gd = controldir.ControlDir.open('.')
 
60
        raise TestSkipped
38
61
        wt = gd.open_workingtree()
39
62
        self.assertIsInstance(wt, workingtree.GitWorkingTree)
40
63
 
41
64
    def test_open_workingtree_bare(self):
42
 
        tests.run_git('--bare', 'init')
 
65
        GitRepo.init_bare(".")
43
66
 
44
 
        gd = bzrdir.BzrDir.open('.')
 
67
        gd = controldir.ControlDir.open('.')
45
68
        self.assertRaises(errors.NoWorkingTree, gd.open_workingtree)
46
69
 
47
 
 
48
 
class TestGitDirFormat(tests.TestCaseInTempDir):
49
 
 
50
 
    _test_needs_features = [tests.GitCommandFeature]
 
70
    def test_git_file(self):
 
71
        gitrepo = GitRepo.init("blah", mkdir=True)
 
72
        self.build_tree_contents(
 
73
            [('foo/', ), ('foo/.git', b'gitdir: ../blah/.git\n')])
 
74
 
 
75
        gd = controldir.ControlDir.open('foo')
 
76
        self.assertEqual(gd.control_url.rstrip('/'),
 
77
                         urlutils.local_path_to_url(os.path.abspath(gitrepo.controldir())))
 
78
 
 
79
 
 
80
class TestGitDirFormat(tests.TestCase):
51
81
 
52
82
    def setUp(self):
53
83
        super(TestGitDirFormat, self).setUp()
54
 
        self.format = dir.LocalGitBzrDirFormat()
 
84
        self.format = dir.LocalGitControlDirFormat()
55
85
 
56
86
    def test_get_format_description(self):
57
 
        self.assertEquals("Local Git Repository",
58
 
                          self.format.get_format_description())
 
87
        self.assertEqual("Local Git Repository",
 
88
                         self.format.get_format_description())
59
89
 
 
90
    def test_eq(self):
 
91
        format2 = dir.LocalGitControlDirFormat()
 
92
        self.assertEqual(self.format, format2)
 
93
        self.assertEqual(self.format, self.format)
 
94
        bzr_format = controldir.format_registry.make_controldir("default")
 
95
        self.assertNotEqual(self.format, bzr_format)