Rev 3311: Use better names for TestIdList methods. in file:///v/home/vila/src/bzr/experimental/faster-selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Mar 24 18:32:21 GMT 2008
At file:///v/home/vila/src/bzr/experimental/faster-selftest/
------------------------------------------------------------
revno: 3311
revision-id: v.ladeuil+lp at free.fr-20080324183216-65qxsdvvjud16rpc
parent: v.ladeuil+lp at free.fr-20080324181758-pzlqy05mg3ktdivu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filter-by-module-test-loader
timestamp: Mon 2008-03-24 19:32:16 +0100
message:
Use better names for TestIdList methods.
* bzrlib/tests/test_selftest.py:
Update tests.
* bzrlib/tests/__init__.py:
(TestIdList.is_module_name_used): Renamed to refers_to.
(TestIdList.test_in): Renamed to includes.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-03-16 10:45:53 +0000
+++ b/bzrlib/tests/__init__.py 2008-03-24 18:32:16 +0000
@@ -2273,7 +2273,7 @@
:return: A callable that returns True if the test's id appears in the list.
"""
def condition(test):
- return id_list.test_in(test.id())
+ return id_list.includes(test.id())
return condition
@@ -2610,11 +2610,11 @@
modules[mod_name] = True
self.modules = modules
- def is_module_name_used(self, module_name):
+ def refers_to(self, module_name):
"""Is there tests for the module or one of its sub modules."""
return self.modules.has_key(module_name)
- def test_in(self, test_id):
+ def includes(self, test_id):
return self.tests.has_key(test_id)
@@ -2772,7 +2772,7 @@
suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
else:
for mod in [m for m in testmod_names
- if id_filter.is_module_name_used(m)]:
+ if id_filter.refers_to(m)]:
mod_suite = loader.loadTestsFromModuleNames([mod])
mod_suite = filter_suite_by_id_list(mod_suite, id_filter)
suite.addTest(mod_suite)
@@ -2784,7 +2784,7 @@
adapt_modules(test_transport_implementations, adapter, loader, suite)
else:
for mod in [m for m in test_transport_implementations
- if id_filter.is_module_name_used(m)]:
+ if id_filter.refers_to(m)]:
mod_suite = TestUtil.TestSuite()
adapt_modules([mod], adapter, loader, mod_suite)
mod_suite = filter_suite_by_id_list(mod_suite, id_filter)
@@ -2793,7 +2793,7 @@
# modules defining their own test_suite()
for package in [p for p in packages_to_test()
if (keep_only is None
- or id_filter.is_module_name_used(p.__name__))]:
+ or id_filter.refers_to(p.__name__))]:
pack_suite = package.test_suite()
if keep_only is not None:
pack_suite = filter_suite_by_id_list(pack_suite, id_filter)
@@ -2801,7 +2801,7 @@
# XXX: MODULES_TO_TEST should be obsoleted ?
for mod in [m for m in MODULES_TO_TEST
- if keep_only is None or id_filter.is_module_name_used(m)]:
+ if keep_only is None or id_filter.refers_to(m)]:
mod_suite = loader.loadTestsFromModule(mod)
if keep_only is not None:
mod_suite = filter_suite_by_id_list(mod_suite, id_filter)
@@ -2821,7 +2821,7 @@
default_encoding = sys.getdefaultencoding()
for name, plugin in bzrlib.plugin.plugins().items():
if keep_only is not None:
- if not id_filter.is_module_name_used(plugin.module.__name__):
+ if not id_filter.refers_to(plugin.module.__name__):
continue
plugin_suite = plugin.test_suite()
# We used to catch ImportError here and turn it into just a warning,
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2008-03-24 18:17:58 +0000
+++ b/bzrlib/tests/test_selftest.py 2008-03-24 18:32:16 +0000
@@ -1963,23 +1963,23 @@
'mod1.submod1',
'mod1.submod2.cl1.meth1', 'mod1.submod2.cl2.meth2',
])
- self.assertTrue(id_list.is_module_name_used('mod1'))
- self.assertTrue(id_list.is_module_name_used('mod1.submod1'))
- self.assertTrue(id_list.is_module_name_used('mod1.submod2'))
- self.assertTrue(id_list.test_in('mod1.cl1.meth1'))
- self.assertTrue(id_list.test_in('mod1.submod1'))
- self.assertTrue(id_list.test_in('mod1.func1'))
+ self.assertTrue(id_list.refers_to('mod1'))
+ self.assertTrue(id_list.refers_to('mod1.submod1'))
+ self.assertTrue(id_list.refers_to('mod1.submod2'))
+ self.assertTrue(id_list.includes('mod1.cl1.meth1'))
+ self.assertTrue(id_list.includes('mod1.submod1'))
+ self.assertTrue(id_list.includes('mod1.func1'))
def test_bad_chars_in_params(self):
id_list = self._create_id_list(['mod1.cl1.meth1(xx.yy)'])
- self.assertTrue(id_list.is_module_name_used('mod1'))
- self.assertTrue(id_list.test_in('mod1.cl1.meth1(xx.yy)'))
+ self.assertTrue(id_list.refers_to('mod1'))
+ self.assertTrue(id_list.includes('mod1.cl1.meth1(xx.yy)'))
def test_module_used(self):
id_list = self._create_id_list(['mod.class.meth'])
- self.assertTrue(id_list.is_module_name_used('mod'))
- self.assertTrue(id_list.is_module_name_used('mod.class'))
- self.assertTrue(id_list.is_module_name_used('mod.class.meth'))
+ self.assertTrue(id_list.refers_to('mod'))
+ self.assertTrue(id_list.refers_to('mod.class'))
+ self.assertTrue(id_list.refers_to('mod.class.meth'))
def test_test_suite(self):
# This test is slow, so we do a single test with one test in each
@@ -2039,7 +2039,7 @@
def _create_loader(self, test_list):
id_filter = tests.TestIdList(test_list)
loader = TestUtil.FilteredByModuleTestLoader(
- id_filter.is_module_name_used)
+ id_filter.refers_to)
return loader
def test_load_tests(self):
More information about the bazaar-commits
mailing list