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

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_git_remote_helper.py
28
28
 
29
29
from ...tests import (
30
30
    TestCaseWithTransport,
31
 
    TestSkipped,
32
31
    )
33
32
 
34
33
from ..object_store import get_object_store
35
34
from ..git_remote_helper import (
36
35
    RemoteHelper,
37
36
    open_local_dir,
38
 
    fastexporter,
39
37
    fetch,
40
38
    )
41
39
 
64
62
 
65
63
    def setUp(self):
66
64
        super(FetchTests, self).setUp()
67
 
        self.local_dir = self.make_branch_and_tree('local', format='git').controldir
 
65
        self.local_dir = self.make_branch_and_tree(
 
66
            'local', format='git').controldir
68
67
        self.remote_tree = self.make_branch_and_tree('remote')
69
68
        self.remote_dir = self.remote_tree.controldir
70
69
        self.shortname = 'bzr'
95
94
 
96
95
    def setUp(self):
97
96
        super(RemoteHelperTests, self).setUp()
98
 
        self.local_dir = self.make_branch_and_tree('local', format='git').controldir
 
97
        self.local_dir = self.make_branch_and_tree(
 
98
            'local', format='git').controldir
99
99
        self.remote_tree = self.make_branch_and_tree('remote')
100
100
        self.remote_dir = self.remote_tree.controldir
101
101
        self.shortname = 'bzr'
102
 
        self.helper = RemoteHelper(self.local_dir, self.shortname, self.remote_dir)
 
102
        self.helper = RemoteHelper(
 
103
            self.local_dir, self.shortname, self.remote_dir)
103
104
 
104
105
    def test_capabilities(self):
105
106
        f = BytesIO()
106
107
        self.helper.cmd_capabilities(f, [])
107
108
        capabs = f.getvalue()
108
109
        base = b"fetch\noption\npush\n"
109
 
        self.assertTrue(capabs in (base+b"\n", base+b"import\n\n"), capabs)
 
110
        self.assertTrue(capabs in (base + b"\n", base + b"import\n\n"), capabs)
110
111
 
111
112
    def test_option(self):
112
113
        f = BytesIO()
125
126
        self.build_tree_contents([("remote/afile", b"somecontent")])
126
127
        self.remote_tree.add(["afile"])
127
128
        self.remote_tree.commit(b"A commit message", timestamp=1330445983,
128
 
            timezone=0, committer=b'Somebody <jrandom@example.com>')
 
129
                                timezone=0, committer=b'Somebody <jrandom@example.com>')
129
130
        f = BytesIO()
130
131
        self.helper.cmd_import(f, ["import", "refs/heads/master"])
131
132
        self.assertEqual(
 
133
            b'reset refs/heads/master\n'
132
134
            b'commit refs/heads/master\n'
133
135
            b'mark :1\n'
134
136
            b'committer Somebody <jrandom@example.com> 1330445983 +0000\n'