← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_msgeditor.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_msgeditor.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Test commit message editor.
18
18
"""
21
21
import sys
22
22
 
23
23
from bzrlib import (
 
24
    commit,
24
25
    errors,
25
26
    msgeditor,
26
27
    osutils,
 
28
    tests,
 
29
    trace,
27
30
    )
28
31
from bzrlib.branch import Branch
29
32
from bzrlib.config import ensure_config_dir_exists, config_filename
31
34
    make_commit_message_template_encoded,
32
35
    edit_commit_message_encoded
33
36
)
34
 
from bzrlib.tests import TestCaseWithTransport, TestSkipped
 
37
from bzrlib.tests import (
 
38
    TestCaseInTempDir,
 
39
    TestCaseWithTransport,
 
40
    TestNotApplicable,
 
41
    TestSkipped,
 
42
    multiply_tests,
 
43
    probe_bad_non_ascii,
 
44
    split_suite_by_re,
 
45
    )
 
46
from bzrlib.tests.EncodingAdapter import encoding_scenarios
35
47
from bzrlib.trace import mutter
36
48
 
 
49
 
 
50
def load_tests(standard_tests, module, loader):
 
51
    """Parameterize the test for tempfile creation with different encodings."""
 
52
    to_adapt, result = split_suite_by_re(standard_tests,
 
53
        "test__create_temp_file_with_commit_template_in_unicode_dir")
 
54
    return multiply_tests(to_adapt, encoding_scenarios, result)
 
55
 
 
56
 
37
57
class MsgEditorTest(TestCaseWithTransport):
38
58
 
39
59
    def make_uncommitted_tree(self):
48
68
                "filesystem encoding %s" % sys.getfilesystemencoding())
49
69
        working_tree.add(filename)
50
70
        return working_tree
51
 
    
 
71
 
52
72
    def test_commit_template(self):
53
73
        """Test building a commit message template"""
54
74
        working_tree = self.make_uncommitted_tree()
60
80
  hell\u00d8
61
81
""")
62
82
 
 
83
    def make_multiple_pending_tree(self):
 
84
        from bzrlib import config
 
85
        config.GlobalConfig().set_user_option('email',
 
86
                                              'Bilbo Baggins <bb@hobbit.net>')
 
87
        tree = self.make_branch_and_tree('a')
 
88
        tree.commit('Initial checkin.', timestamp=1230912900, timezone=0)
 
89
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
90
        tree.commit('Minor tweak.', timestamp=1231977840, timezone=0)
 
91
        tree2.commit('Feature X work.', timestamp=1233186240, timezone=0)
 
92
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
 
93
        tree2.commit('Feature X finished.', timestamp=1233187680, timezone=0)
 
94
        tree3.commit('Feature Y, based on initial X work.',
 
95
                     timestamp=1233285960, timezone=0)
 
96
        tree.merge_from_branch(tree2.branch)
 
97
        tree.merge_from_branch(tree3.branch, force=True)
 
98
        return tree
 
99
 
 
100
    def test_commit_template_pending_merges(self):
 
101
        """Test building a commit message template when there are pending
 
102
        merges.  The commit message should show all pending merge revisions,
 
103
        as does 'status -v', not only the merge tips.
 
104
        """
 
105
        working_tree = self.make_multiple_pending_tree()
 
106
        template = msgeditor.make_commit_message_template(working_tree, None)
 
107
        self.assertEqualDiff(template,
 
108
u"""\
 
109
pending merges:
 
110
  Bilbo Baggins 2009-01-29 Feature X finished.
 
111
    Bilbo Baggins 2009-01-28 Feature X work.
 
112
  Bilbo Baggins 2009-01-30 Feature Y, based on initial X work.
 
113
""")
 
114
 
63
115
    def test_commit_template_encoded(self):
64
116
        """Test building a commit message template"""
65
117
        working_tree = self.make_uncommitted_tree()
90
142
  hell\u00d8
91
143
""".encode('utf8') in template)
92
144
 
93
 
    def setUp(self):
94
 
        super(MsgEditorTest, self).setUp()
95
 
        self._bzr_editor = os.environ.get('BZR_EDITOR', None)
96
 
 
97
 
    def tearDown(self):
98
 
        if self._bzr_editor is not None:
99
 
            os.environ['BZR_EDITOR'] = self._bzr_editor
100
 
        else:
101
 
            if os.environ.get('BZR_EDITOR', None) is not None:
102
 
                del os.environ['BZR_EDITOR']
103
 
        super(MsgEditorTest, self).tearDown()
104
 
 
105
 
    def test_run_editor(self):
 
145
    def make_do_nothing_editor(self):
106
146
        if sys.platform == "win32":
107
147
            f = file('fed.bat', 'w')
108
148
            f.write('@rem dummy fed')
109
149
            f.close()
110
 
            os.environ['BZR_EDITOR'] = 'fed.bat'
 
150
            return 'fed.bat'
111
151
        else:
112
152
            f = file('fed.sh', 'wb')
113
153
            f.write('#!/bin/sh\n')
114
154
            f.close()
115
155
            os.chmod('fed.sh', 0755)
116
 
            os.environ['BZR_EDITOR'] = './fed.sh'
 
156
            return './fed.sh'
117
157
 
 
158
    def test_run_editor(self):
 
159
        os.environ['BZR_EDITOR'] = self.make_do_nothing_editor()
118
160
        self.assertEqual(True, msgeditor._run_editor(''),
119
161
                         'Unable to run dummy fake editor')
120
162
 
162
204
        self.assertEqual('test message from fed\n',
163
205
                         msgeditor.edit_commit_message(''))
164
206
 
 
207
        mutter('edit_commit_message with ascii string infotext')
 
208
        self.assertEqual('test message from fed\n',
 
209
                         msgeditor.edit_commit_message('spam'))
 
210
 
165
211
        mutter('edit_commit_message with unicode infotext')
166
212
        self.assertEqual('test message from fed\n',
167
213
                         msgeditor.edit_commit_message(u'\u1234'))
205
251
            f.close()
206
252
 
207
253
            editors = list(msgeditor._get_editor())
 
254
            editors = [editor for (editor, cfg_src) in editors]
208
255
 
209
256
            self.assertEqual(['bzr_editor', 'config_editor', 'visual',
210
257
                              'editor'], editors[:4])
230
277
            else:
231
278
                os.environ['EDITOR'] = editor
232
279
 
 
280
    def test__run_editor_EACCES(self):
 
281
        """If running a configured editor raises EACESS, the user is warned."""
 
282
        os.environ['BZR_EDITOR'] = 'eacces.py'
 
283
        f = file('eacces.py', 'wb')
 
284
        f.write('# Not a real editor')
 
285
        f.close()
 
286
        # Make the fake editor unreadable (and unexecutable)
 
287
        os.chmod('eacces.py', 0)
 
288
        # Set $EDITOR so that _run_editor will terminate before trying real
 
289
        # editors.
 
290
        os.environ['EDITOR'] = self.make_do_nothing_editor()
 
291
        # Call _run_editor, capturing mutter.warning calls.
 
292
        warnings = []
 
293
        def warning(*args):
 
294
            if len(args) > 1:
 
295
                warnings.append(args[0] % args[1:])
 
296
            else:
 
297
                warnings.append(args[0])
 
298
        _warning = trace.warning
 
299
        trace.warning = warning
 
300
        try:
 
301
            msgeditor._run_editor('')
 
302
        finally:
 
303
            trace.warning = _warning
 
304
        self.assertStartsWith(warnings[0], 'Could not start editor "eacces.py"')
 
305
 
233
306
    def test__create_temp_file_with_commit_template(self):
234
307
        # check that commit template written properly
235
308
        # and has platform native line-endings (CRLF on win32)
245
318
                                    'infotext'])
246
319
        self.assertFileEqual(expected, msgfilename)
247
320
 
 
321
    def test__create_temp_file_with_commit_template_in_unicode_dir(self):
 
322
        self.requireFeature(tests.UnicodeFilenameFeature)
 
323
        if hasattr(self, 'info'):
 
324
            os.mkdir(self.info['directory'])
 
325
            os.chdir(self.info['directory'])
 
326
            msgeditor._create_temp_file_with_commit_template('infotext')
 
327
        else:
 
328
            raise TestNotApplicable('Test run elsewhere with non-ascii data.')
 
329
 
248
330
    def test__create_temp_file_with_empty_commit_template(self):
249
331
        # empty file
250
332
        create_file = msgeditor._create_temp_file_with_commit_template
256
338
    def test_unsupported_encoding_commit_message(self):
257
339
        old_env = osutils.set_or_unset_env('LANG', 'C')
258
340
        try:
259
 
            self.make_fake_editor(message='\xff')
 
341
            # LANG env variable has no effect on Windows
 
342
            # but some characters anyway cannot be represented
 
343
            # in default user encoding
 
344
            char = probe_bad_non_ascii(osutils.get_user_encoding())
 
345
            if char is None:
 
346
                raise TestSkipped('Cannot find suitable non-ascii character '
 
347
                    'for user_encoding (%s)' % osutils.get_user_encoding())
 
348
 
 
349
            self.make_fake_editor(message=char)
260
350
 
261
351
            working_tree = self.make_uncommitted_tree()
262
352
            self.assertRaises(errors.BadCommitMessageEncoding,
263
353
                              msgeditor.edit_commit_message, '')
264
354
        finally:
265
355
            osutils.set_or_unset_env('LANG', old_env)
 
356
 
 
357
    def test_generate_commit_message_template_no_hooks(self):
 
358
        commit_obj = commit.Commit()
 
359
        self.assertIs(None,
 
360
            msgeditor.generate_commit_message_template(commit_obj))
 
361
 
 
362
    def test_generate_commit_message_template_hook(self):
 
363
        def restoreDefaults():
 
364
            msgeditor.hooks['commit_message_template'] = []
 
365
        self.addCleanup(restoreDefaults)
 
366
        msgeditor.hooks.install_named_hook("commit_message_template",
 
367
                lambda commit_obj, msg: "save me some typing\n", None)
 
368
        commit_obj = commit.Commit()
 
369
        self.assertEquals("save me some typing\n",
 
370
            msgeditor.generate_commit_message_template(commit_obj))
 
371
 
 
372
 
 
373
# GZ 2009-11-17: This wants moving to osutils when the errno checking code is
 
374
class TestPlatformErrnoWorkarounds(TestCaseInTempDir):
 
375
    """Ensuring workarounds enshrined in code actually serve a purpose"""
 
376
 
 
377
    def test_subprocess_call_bad_file(self):
 
378
        if sys.platform != "win32":
 
379
            raise TestNotApplicable("Workarounds for windows only")
 
380
        import subprocess, errno
 
381
        ERROR_BAD_EXE_FORMAT = 193
 
382
        file("textfile.txt", "w").close()
 
383
        e = self.assertRaises(WindowsError, subprocess.call, "textfile.txt")
 
384
        # Python2.4 used the 'winerror' as the errno, which confuses a lot of
 
385
        # our error trapping code. Make sure that we understand the mapping
 
386
        # correctly.
 
387
        if sys.version_info >= (2, 5):
 
388
            self.assertEqual(e.errno, errno.ENOEXEC)
 
389
            self.assertEqual(e.winerror, ERROR_BAD_EXE_FORMAT)
 
390
        else:
 
391
            self.assertEqual(e.errno, ERROR_BAD_EXE_FORMAT)