← 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: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_msgeditor.py
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
"""
35
35
    edit_commit_message_encoded
36
36
)
37
37
from bzrlib.tests import (
38
 
    iter_suite_tests,
39
 
    probe_bad_non_ascii,
40
 
    split_suite_by_re,
 
38
    TestCaseInTempDir,
41
39
    TestCaseWithTransport,
42
40
    TestNotApplicable,
43
41
    TestSkipped,
 
42
    multiply_tests,
 
43
    probe_bad_non_ascii,
 
44
    split_suite_by_re,
44
45
    )
45
 
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
 
46
from bzrlib.tests.EncodingAdapter import encoding_scenarios
46
47
from bzrlib.trace import mutter
47
48
 
48
49
 
50
51
    """Parameterize the test for tempfile creation with different encodings."""
51
52
    to_adapt, result = split_suite_by_re(standard_tests,
52
53
        "test__create_temp_file_with_commit_template_in_unicode_dir")
53
 
    for test in iter_suite_tests(to_adapt):
54
 
        result.addTests(EncodingTestAdapter().adapt(test))
55
 
    return result
 
54
    return multiply_tests(to_adapt, encoding_scenarios, result)
56
55
 
57
56
 
58
57
class MsgEditorTest(TestCaseWithTransport):
69
68
                "filesystem encoding %s" % sys.getfilesystemencoding())
70
69
        working_tree.add(filename)
71
70
        return working_tree
72
 
    
 
71
 
73
72
    def test_commit_template(self):
74
73
        """Test building a commit message template"""
75
74
        working_tree = self.make_uncommitted_tree()
81
80
  hell\u00d8
82
81
""")
83
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
 
84
115
    def test_commit_template_encoded(self):
85
116
        """Test building a commit message template"""
86
117
        working_tree = self.make_uncommitted_tree()
260
291
        # Call _run_editor, capturing mutter.warning calls.
261
292
        warnings = []
262
293
        def warning(*args):
263
 
            warnings.append(args[0] % args[1:])
 
294
            if len(args) > 1:
 
295
                warnings.append(args[0] % args[1:])
 
296
            else:
 
297
                warnings.append(args[0])
264
298
        _warning = trace.warning
265
299
        trace.warning = warning
266
300
        try:
322
356
 
323
357
    def test_generate_commit_message_template_no_hooks(self):
324
358
        commit_obj = commit.Commit()
325
 
        self.assertIs(None, 
 
359
        self.assertIs(None,
326
360
            msgeditor.generate_commit_message_template(commit_obj))
327
361
 
328
362
    def test_generate_commit_message_template_hook(self):
329
 
        def restoreDefaults():
330
 
            msgeditor.hooks['commit_message_template'] = []
331
 
        self.addCleanup(restoreDefaults)
332
363
        msgeditor.hooks.install_named_hook("commit_message_template",
333
364
                lambda commit_obj, msg: "save me some typing\n", None)
334
365
        commit_obj = commit.Commit()
335
 
        self.assertEquals("save me some typing\n", 
 
366
        self.assertEquals("save me some typing\n",
336
367
            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)