← 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: 2009-03-06 20:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4088.
  • Revision ID: john@arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
Fix a small bug in setup.py when an extension fails to build

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., 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):
94
95
        tree3.commit('Feature Y, based on initial X work.',
95
96
                     timestamp=1233285960, timezone=0)
96
97
        tree.merge_from_branch(tree2.branch)
97
 
        tree.merge_from_branch(tree3.branch, force=True)
 
98
        tree.merge_from_branch(tree3.branch)
98
99
        return tree
99
100
 
100
101
    def test_commit_template_pending_merges(self):
291
292
        # Call _run_editor, capturing mutter.warning calls.
292
293
        warnings = []
293
294
        def warning(*args):
294
 
            if len(args) > 1:
295
 
                warnings.append(args[0] % args[1:])
296
 
            else:
297
 
                warnings.append(args[0])
 
295
            warnings.append(args[0] % args[1:])
298
296
        _warning = trace.warning
299
297
        trace.warning = warning
300
298
        try:
360
358
            msgeditor.generate_commit_message_template(commit_obj))
361
359
 
362
360
    def test_generate_commit_message_template_hook(self):
 
361
        def restoreDefaults():
 
362
            msgeditor.hooks['commit_message_template'] = []
 
363
        self.addCleanup(restoreDefaults)
363
364
        msgeditor.hooks.install_named_hook("commit_message_template",
364
365
                lambda commit_obj, msg: "save me some typing\n", None)
365
366
        commit_obj = commit.Commit()
366
367
        self.assertEquals("save me some typing\n",
367
368
            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)