/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/tests/test_status.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-04 12:50:55 UTC
  • mfrom: (7027.2.8 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180704125055-8nni25pn2439p48v
Fix eol handling in knits on Python 3, port fastimport plugin to Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/fastimport-fixes/+merge/348924

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_status.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from StringIO import StringIO
19
18
 
20
 
from bzrlib import config
21
 
from bzrlib.revisionspec import RevisionSpec
22
 
from bzrlib.status import show_pending_merges, show_tree_status
23
 
from bzrlib.tests import TestCaseWithTransport
 
19
from .. import (
 
20
    config,
 
21
    status as _mod_status,
 
22
    )
 
23
from ..revisionspec import RevisionSpec
 
24
from ..sixish import (
 
25
    BytesIO,
 
26
    )
 
27
from ..status import show_pending_merges, show_tree_status
 
28
from . import TestCaseWithTransport
24
29
 
25
30
 
26
31
class TestStatus(TestCaseWithTransport):
31
36
        tree.commit('empty commit')
32
37
        tree2 = self.make_branch_and_tree('b')
33
38
        # set a left most parent that is not a present commit
34
 
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
 
39
        tree2.add_parent_tree_id(b'some-ghost', allow_leftmost_as_ghost=True)
35
40
        # do a merge
36
41
        tree2.merge_from_branch(tree.branch)
37
 
        output = StringIO()
 
42
        output = BytesIO()
38
43
        tree2.lock_read()
39
44
        try:
40
45
            show_pending_merges(tree2, output)
43
48
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
49
 
45
50
    def make_multiple_pending_tree(self):
46
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
51
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
47
52
        tree = self.make_branch_and_tree('a')
48
53
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
49
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
54
        tree2 = tree.controldir.clone('b').open_workingtree()
50
55
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
51
56
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
52
 
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
 
57
        tree3 = tree2.controldir.clone('c').open_workingtree()
53
58
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
59
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
60
        tree.merge_from_branch(tree2.branch)
58
63
 
59
64
    def test_multiple_pending(self):
60
65
        tree = self.make_multiple_pending_tree()
61
 
        output = StringIO()
 
66
        output = BytesIO()
62
67
        tree.lock_read()
63
68
        self.addCleanup(tree.unlock)
64
69
        show_pending_merges(tree, output)
71
76
 
72
77
    def test_multiple_pending_verbose(self):
73
78
        tree = self.make_multiple_pending_tree()
74
 
        output = StringIO()
 
79
        output = BytesIO()
75
80
        tree.lock_read()
76
81
        self.addCleanup(tree.unlock)
77
82
        show_pending_merges(tree, output, verbose=True)
87
92
        """Test when a pending merge is itself a ghost"""
88
93
        tree = self.make_branch_and_tree('a')
89
94
        tree.commit('first')
90
 
        tree.add_parent_tree_id('a-ghost-revision')
 
95
        tree.add_parent_tree_id(b'a-ghost-revision')
91
96
        tree.lock_read()
92
97
        self.addCleanup(tree.unlock)
93
 
        output = StringIO()
 
98
        output = BytesIO()
94
99
        show_pending_merges(tree, output)
95
100
        self.assertEqualDiff(
96
101
            'pending merge tips: (use -v to see all merge revisions)\n'
99
104
 
100
105
    def test_pending_with_ghosts(self):
101
106
        """Test when a pending merge's ancestry includes ghosts."""
102
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
107
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
103
108
        tree = self.make_branch_and_tree('a')
104
109
        tree.commit('empty commit')
105
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
110
        tree2 = tree.controldir.clone('b').open_workingtree()
106
111
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
107
 
        tree2.add_parent_tree_id('a-ghost-revision')
 
112
        tree2.add_parent_tree_id(b'a-ghost-revision')
108
113
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
109
114
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
110
115
        tree.merge_from_branch(tree2.branch)
111
116
        tree.lock_read()
112
117
        self.addCleanup(tree.unlock)
113
 
        output = StringIO()
 
118
        output = BytesIO()
114
119
        show_pending_merges(tree, output, verbose=True)
115
120
        self.assertEqualDiff('pending merges:\n'
116
121
                             '  Joe Foo 2007-12-04 another non-ghost\n'
125
130
        r1_id = tree.commit('one', allow_pointless=True)
126
131
        r2_id = tree.commit('two', allow_pointless=True)
127
132
        r2_tree = tree.branch.repository.revision_tree(r2_id)
128
 
        output = StringIO()
 
133
        output = BytesIO()
129
134
        show_tree_status(tree, to_file=output,
130
135
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id),
131
136
                               RevisionSpec.from_string("revid:%s" % r2_id)])
132
137
        # return does not matter as long as it did not raise.
 
138
 
 
139
 
 
140
class TestHooks(TestCaseWithTransport):
 
141
 
 
142
    def test_constructor(self):
 
143
        """Check that creating a StatusHooks instance has the right defaults.
 
144
        """
 
145
        hooks = _mod_status.StatusHooks()
 
146
        self.assertTrue("post_status" in hooks, "post_status not in %s" % hooks)
 
147
        self.assertTrue("pre_status" in hooks, "pre_status not in %s" % hooks)
 
148
 
 
149
    def test_installed_hooks_are_StatusHooks(self):
 
150
        """The installed hooks object should be a StatusHooks.
 
151
        """
 
152
        # the installed hooks are saved in self._preserved_hooks.
 
153
        self.assertIsInstance(self._preserved_hooks[_mod_status][1],
 
154
            _mod_status.StatusHooks)
 
155
 
 
156
    def test_post_status_hook(self):
 
157
        """Ensure that post_status hook is invoked with the right args.
 
158
        """
 
159
        calls = []
 
160
        _mod_status.hooks.install_named_hook('post_status', calls.append, None)
 
161
        self.assertLength(0, calls)
 
162
        tree = self.make_branch_and_tree('.')
 
163
        r1_id = tree.commit('one', allow_pointless=True)
 
164
        r2_id = tree.commit('two', allow_pointless=True)
 
165
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
166
        output = BytesIO()
 
167
        show_tree_status(tree, to_file=output,
 
168
            revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
169
                RevisionSpec.from_string("revid:%s" % r2_id)])
 
170
        self.assertLength(1, calls)
 
171
        params = calls[0]
 
172
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
173
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
174
            'show_ids', 'short', 'verbose', 'specific_files']
 
175
        for a in attrs:
 
176
            self.assertTrue(hasattr(params, a),
 
177
                'Attribute "%s" not found in StatusHookParam' % a)
 
178
 
 
179
    def test_pre_status_hook(self):
 
180
        """Ensure that pre_status hook is invoked with the right args.
 
181
        """
 
182
        calls = []
 
183
        _mod_status.hooks.install_named_hook('pre_status', calls.append, None)
 
184
        self.assertLength(0, calls)
 
185
        tree = self.make_branch_and_tree('.')
 
186
        r1_id = tree.commit('one', allow_pointless=True)
 
187
        r2_id = tree.commit('two', allow_pointless=True)
 
188
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
189
        output = BytesIO()
 
190
        show_tree_status(tree, to_file=output,
 
191
            revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
192
                RevisionSpec.from_string("revid:%s" % r2_id)])
 
193
        self.assertLength(1, calls)
 
194
        params = calls[0]
 
195
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
196
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
197
            'show_ids', 'short', 'verbose', 'specific_files']
 
198
        for a in attrs:
 
199
            self.assertTrue(hasattr(params, a),
 
200
                'Attribute "%s" not found in StatusHookParam' % a)
 
201