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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-05 21:53:22 UTC
  • mfrom: (3928.4.3 bug_295826)
  • Revision ID: pqm@pqm.ubuntu.com-20090205215322-dlhyepy2fid5i7w6
(jam) Minor tweak to setup.py documentation for bug #295826

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_msgeditor.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Test commit message editor.
18
18
"""
35
35
    edit_commit_message_encoded
36
36
)
37
37
from bzrlib.tests import (
38
 
    TestCaseInTempDir,
 
38
    iter_suite_tests,
 
39
    probe_bad_non_ascii,
 
40
    split_suite_by_re,
39
41
    TestCaseWithTransport,
40
42
    TestNotApplicable,
41
43
    TestSkipped,
42
 
    multiply_tests,
43
 
    probe_bad_non_ascii,
44
 
    split_suite_by_re,
45
44
    )
46
 
from bzrlib.tests.EncodingAdapter import encoding_scenarios
 
45
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
47
46
from bzrlib.trace import mutter
48
47
 
49
48
 
51
50
    """Parameterize the test for tempfile creation with different encodings."""
52
51
    to_adapt, result = split_suite_by_re(standard_tests,
53
52
        "test__create_temp_file_with_commit_template_in_unicode_dir")
54
 
    return multiply_tests(to_adapt, encoding_scenarios, result)
 
53
    for test in iter_suite_tests(to_adapt):
 
54
        result.addTests(EncodingTestAdapter().adapt(test))
 
55
    return result
55
56
 
56
57
 
57
58
class MsgEditorTest(TestCaseWithTransport):
68
69
                "filesystem encoding %s" % sys.getfilesystemencoding())
69
70
        working_tree.add(filename)
70
71
        return working_tree
71
 
 
 
72
    
72
73
    def test_commit_template(self):
73
74
        """Test building a commit message template"""
74
75
        working_tree = self.make_uncommitted_tree()
80
81
  hell\u00d8
81
82
""")
82
83
 
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
 
 
115
84
    def test_commit_template_encoded(self):
116
85
        """Test building a commit message template"""
117
86
        working_tree = self.make_uncommitted_tree()
291
260
        # Call _run_editor, capturing mutter.warning calls.
292
261
        warnings = []
293
262
        def warning(*args):
294
 
            if len(args) > 1:
295
 
                warnings.append(args[0] % args[1:])
296
 
            else:
297
 
                warnings.append(args[0])
 
263
            warnings.append(args[0] % args[1:])
298
264
        _warning = trace.warning
299
265
        trace.warning = warning
300
266
        try:
356
322
 
357
323
    def test_generate_commit_message_template_no_hooks(self):
358
324
        commit_obj = commit.Commit()
359
 
        self.assertIs(None,
 
325
        self.assertIs(None, 
360
326
            msgeditor.generate_commit_message_template(commit_obj))
361
327
 
362
328
    def test_generate_commit_message_template_hook(self):
 
329
        def restoreDefaults():
 
330
            msgeditor.hooks['commit_message_template'] = []
 
331
        self.addCleanup(restoreDefaults)
363
332
        msgeditor.hooks.install_named_hook("commit_message_template",
364
333
                lambda commit_obj, msg: "save me some typing\n", None)
365
334
        commit_obj = commit.Commit()
366
 
        self.assertEquals("save me some typing\n",
 
335
        self.assertEquals("save me some typing\n", 
367
336
            msgeditor.generate_commit_message_template(commit_obj))
368
 
 
369
 
 
370
 
# GZ 2009-11-17: This wants moving to osutils when the errno checking code is
371
 
class TestPlatformErrnoWorkarounds(TestCaseInTempDir):
372
 
    """Ensuring workarounds enshrined in code actually serve a purpose"""
373
 
 
374
 
    def test_subprocess_call_bad_file(self):
375
 
        if sys.platform != "win32":
376
 
            raise TestNotApplicable("Workarounds for windows only")
377
 
        import subprocess, errno
378
 
        ERROR_BAD_EXE_FORMAT = 193
379
 
        file("textfile.txt", "w").close()
380
 
        e = self.assertRaises(WindowsError, subprocess.call, "textfile.txt")
381
 
        # Python2.4 used the 'winerror' as the errno, which confuses a lot of
382
 
        # our error trapping code. Make sure that we understand the mapping
383
 
        # correctly.
384
 
        if sys.version_info >= (2, 5):
385
 
            self.assertEqual(e.errno, errno.ENOEXEC)
386
 
            self.assertEqual(e.winerror, ERROR_BAD_EXE_FORMAT)
387
 
        else:
388
 
            self.assertEqual(e.errno, ERROR_BAD_EXE_FORMAT)