/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: Martin
  • Date: 2018-11-16 16:38:22 UTC
  • mto: This revision was merged to the branch mainline in revision 7172.
  • Revision ID: gzlist@googlemail.com-20181116163822-yg1h1cdng6w7w9kn
Make --profile-imports work on Python 3

Also tweak heading to line up correctly.

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
    StringIO,
 
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
42
        output = StringIO()
38
 
        tree2.lock_read()
39
 
        try:
 
43
        with tree2.lock_read():
40
44
            show_pending_merges(tree2, output)
41
 
        finally:
42
 
            tree2.unlock()
43
45
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
46
 
45
47
    def make_multiple_pending_tree(self):
46
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
48
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
47
49
        tree = self.make_branch_and_tree('a')
48
50
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
49
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
51
        tree2 = tree.controldir.clone('b').open_workingtree()
50
52
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
51
53
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
52
 
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
 
54
        tree3 = tree2.controldir.clone('c').open_workingtree()
53
55
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
56
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
57
        tree.merge_from_branch(tree2.branch)
87
89
        """Test when a pending merge is itself a ghost"""
88
90
        tree = self.make_branch_and_tree('a')
89
91
        tree.commit('first')
90
 
        tree.add_parent_tree_id('a-ghost-revision')
 
92
        tree.add_parent_tree_id(b'a-ghost-revision')
91
93
        tree.lock_read()
92
94
        self.addCleanup(tree.unlock)
93
95
        output = StringIO()
99
101
 
100
102
    def test_pending_with_ghosts(self):
101
103
        """Test when a pending merge's ancestry includes ghosts."""
102
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
104
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
103
105
        tree = self.make_branch_and_tree('a')
104
106
        tree.commit('empty commit')
105
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
107
        tree2 = tree.controldir.clone('b').open_workingtree()
106
108
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
107
 
        tree2.add_parent_tree_id('a-ghost-revision')
 
109
        tree2.add_parent_tree_id(b'a-ghost-revision')
108
110
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
109
111
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
110
112
        tree.merge_from_branch(tree2.branch)
127
129
        r2_tree = tree.branch.repository.revision_tree(r2_id)
128
130
        output = StringIO()
129
131
        show_tree_status(tree, to_file=output,
130
 
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id),
131
 
                               RevisionSpec.from_string("revid:%s" % r2_id)])
 
132
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
 
133
                               RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
132
134
        # return does not matter as long as it did not raise.
 
135
 
 
136
 
 
137
class TestHooks(TestCaseWithTransport):
 
138
 
 
139
    def test_constructor(self):
 
140
        """Check that creating a StatusHooks instance has the right defaults.
 
141
        """
 
142
        hooks = _mod_status.StatusHooks()
 
143
        self.assertTrue("post_status" in hooks, "post_status not in %s" % hooks)
 
144
        self.assertTrue("pre_status" in hooks, "pre_status not in %s" % hooks)
 
145
 
 
146
    def test_installed_hooks_are_StatusHooks(self):
 
147
        """The installed hooks object should be a StatusHooks.
 
148
        """
 
149
        # the installed hooks are saved in self._preserved_hooks.
 
150
        self.assertIsInstance(self._preserved_hooks[_mod_status][1],
 
151
            _mod_status.StatusHooks)
 
152
 
 
153
    def test_post_status_hook(self):
 
154
        """Ensure that post_status hook is invoked with the right args.
 
155
        """
 
156
        calls = []
 
157
        _mod_status.hooks.install_named_hook('post_status', calls.append, None)
 
158
        self.assertLength(0, calls)
 
159
        tree = self.make_branch_and_tree('.')
 
160
        r1_id = tree.commit('one', allow_pointless=True)
 
161
        r2_id = tree.commit('two', allow_pointless=True)
 
162
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
163
        output = StringIO()
 
164
        show_tree_status(tree, to_file=output,
 
165
            revision=[RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
 
166
                RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
 
167
        self.assertLength(1, calls)
 
168
        params = calls[0]
 
169
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
170
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
171
            'show_ids', 'short', 'verbose', 'specific_files']
 
172
        for a in attrs:
 
173
            self.assertTrue(hasattr(params, a),
 
174
                'Attribute "%s" not found in StatusHookParam' % a)
 
175
 
 
176
    def test_pre_status_hook(self):
 
177
        """Ensure that pre_status hook is invoked with the right args.
 
178
        """
 
179
        calls = []
 
180
        _mod_status.hooks.install_named_hook('pre_status', calls.append, None)
 
181
        self.assertLength(0, calls)
 
182
        tree = self.make_branch_and_tree('.')
 
183
        r1_id = tree.commit('one', allow_pointless=True)
 
184
        r2_id = tree.commit('two', allow_pointless=True)
 
185
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
186
        output = StringIO()
 
187
        show_tree_status(tree, to_file=output,
 
188
            revision=[RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
 
189
                RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
 
190
        self.assertLength(1, calls)
 
191
        params = calls[0]
 
192
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
193
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
194
            'show_ids', 'short', 'verbose', 'specific_files']
 
195
        for a in attrs:
 
196
            self.assertTrue(hasattr(params, a),
 
197
                'Attribute "%s" not found in StatusHookParam' % a)
 
198