Rev 2935: Push the message editor test parameterisation down into the message editor in http://people.ubuntu.com/~robertc/baz2.0/delegate-test-suite

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/delegate-test-suite

------------------------------------------------------------
revno: 2935
revision-id:robertc at robertcollins.net-20071218073644-1npofqduijg8tkie
parent: robertc at robertcollins.net-20071218072914-4u8lpcxet9umd1sg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: delegate-test-suite
timestamp: Tue 2007-12-18 18:36:44 +1100
message:
  Push the message editor test parameterisation down into the message editor
  tests.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-12-18 05:37:55 +0000
+++ b/bzrlib/tests/__init__.py	2007-12-18 07:36:44 +0000
@@ -98,7 +98,6 @@
                           TestSuite,
                           TestLoader,
                           )
-from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
 from bzrlib.tests.treeshape import build_tree_contents
 import bzrlib.version_info_formats.format_custom
 from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2
@@ -2677,10 +2676,6 @@
     from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
     adapter = TransportTestProviderAdapter()
     adapt_modules(test_transport_implementations, adapter, loader, suite)
-    adapt_tests(
-        ["bzrlib.tests.test_msgeditor.MsgEditorTest."
-         "test__create_temp_file_with_commit_template_in_unicode_dir"],
-        EncodingTestAdapter(), loader, suite)
     for package in packages_to_test():
         suite.addTest(package.test_suite())
     for m in MODULES_TO_TEST:

=== modified file 'bzrlib/tests/test_msgeditor.py'
--- a/bzrlib/tests/test_msgeditor.py	2007-12-05 03:26:37 +0000
+++ b/bzrlib/tests/test_msgeditor.py	2007-12-18 07:36:44 +0000
@@ -33,14 +33,26 @@
     edit_commit_message_encoded
 )
 from bzrlib.tests import (
+    iter_suite_tests,
     probe_bad_non_ascii,
+    split_suite_by_re,
     TestCaseWithTransport,
     TestNotApplicable,
     TestSkipped,
     )
+from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
 from bzrlib.trace import mutter
 
 
+def load_tests(standard_tests, module, loader):
+    """Parameterise the test for tempfile creation with different encodings."""
+    to_adapt, result = split_suite_by_re(standard_tests,
+        "test__create_temp_file_with_commit_template_in_unicode_dir")
+    for test in iter_suite_tests(to_adapt):
+        result.addTests(EncodingTestAdapter().adapt(test))
+    return result
+
+
 class MsgEditorTest(TestCaseWithTransport):
 
     def make_uncommitted_tree(self):