Rev 3324: Slight test suite refactorings in http://code.launchpad.net/%7Ev-ladeuil/bzr/bzr.integration
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Apr 1 08:27:46 BST 2008
At http://code.launchpad.net/%7Ev-ladeuil/bzr/bzr.integration
------------------------------------------------------------
revno: 3324
revision-id: v.ladeuil+lp at free.fr-20080401072719-m4otoyckyia5krob
parent: pqm at pqm.ubuntu.com-20080401055945-3pmuiy0q0301axv6
parent: v.ladeuil+lp at free.fr-20080331172008-o31h3ai3qb8vwjx4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Tue 2008-04-01 09:27:19 +0200
message:
Slight test suite refactorings
modified:
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.7.12
revision-id: v.ladeuil+lp at free.fr-20080331172008-o31h3ai3qb8vwjx4
parent: v.ladeuil+lp at free.fr-20080331171123-d1aihpfvqnx6u8mp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-31 19:20:08 +0200
message:
Add an optional loader parameter needed when deploying the (upcoming)
FilteredByModuleTestLoader for parametrized inventory_implementations and
repository_implementations tests.
* bzrlib/tests/__init__.py:
(multiply_tests_from_modules): Add an optional loader parameter.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3302.7.11
revision-id: v.ladeuil+lp at free.fr-20080331171123-d1aihpfvqnx6u8mp
parent: v.ladeuil+lp at free.fr-20080330202829-5ups6isujc9z5p8i
parent: pqm at pqm.ubuntu.com-20080331105632-qxz6ssqxpb7sb0hv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-31 19:11:23 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3302.7.10
revision-id: v.ladeuil+lp at free.fr-20080330202829-5ups6isujc9z5p8i
parent: v.ladeuil+lp at free.fr-20080326214357-q0b9195s9qqfc2pw
parent: v.ladeuil+lp at free.fr-20080330201640-cqg11m8ay5bn095n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Sun 2008-03-30 22:28:29 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
------------------------------------------------------------
revno: 3302.7.9
revision-id: v.ladeuil+lp at free.fr-20080326214357-q0b9195s9qqfc2pw
parent: v.ladeuil+lp at free.fr-20080326081001-akh733lcdhiep83b
parent: v.ladeuil+lp at free.fr-20080326214331-khydifx3q86yqgqm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Wed 2008-03-26 22:43:57 +0100
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 3302.7.8
revision-id: v.ladeuil+lp at free.fr-20080326081001-akh733lcdhiep83b
parent: v.ladeuil+lp at free.fr-20080324220159-1d3l3niap11l5bhi
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Wed 2008-03-26 09:10:01 +0100
message:
Fix typos.
* bzrlib/tests/test_selftest.py:
(TestTestLoader.test_load_tests_from_module_name_with_bogus_module_name):
Fix typo.
* bzrlib/tests/TestUtil.py:
(TestLoader.getTestCaseNames): Fix typo.
modified:
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.7.7
revision-id: v.ladeuil+lp at free.fr-20080324220159-1d3l3niap11l5bhi
parent: v.ladeuil+lp at free.fr-20080324191512-mcx6mmm1cfcz38fa
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-24 23:01:59 +0100
message:
Remove cruft.
* bzrlib/tests/__init__.py:
(test_suite): Delete all references to MODULES_TO_TEST. History
research reveals that the variable have always been empty...
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3302.7.6
revision-id: v.ladeuil+lp at free.fr-20080324191512-mcx6mmm1cfcz38fa
parent: v.ladeuil+lp at free.fr-20080324191343-rl7i9z6ttj6ixarq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-24 20:15:12 +0100
message:
Catch up with loadTestsFromModuleName use.
* bzrlib/tests/test_selftest.py:
(TestTestIdList.test_test_suite_matches_id_list_with_unknown,
TestTestIdList.test_suite_matches_id_list_with_duplicates): Use
loadTestsFromModuleName.
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.7.5
revision-id: v.ladeuil+lp at free.fr-20080324191343-rl7i9z6ttj6ixarq
parent: v.ladeuil+lp at free.fr-20080324184438-9f3qbvf83jo1pqdm
parent: v.ladeuil+lp at free.fr-20080324191209-23lppe6oqc0ef4kh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-24 20:13:43 +0100
message:
Help identify duplicates IDs in test suite
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.7.4
revision-id: v.ladeuil+lp at free.fr-20080324184438-9f3qbvf83jo1pqdm
parent: v.ladeuil+lp at free.fr-20080324181042-15cfp1w770nf3pgb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-24 19:44:38 +0100
message:
Cosmetic change.
* bzrlib/tests/test_selftest.py:
(TestSelftestFiltering.test_randomize_suite): Fix useless broken
line.
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.7.3
revision-id: v.ladeuil+lp at free.fr-20080324181042-15cfp1w770nf3pgb
parent: v.ladeuil+lp at free.fr-20080324174247-ngn30tddzl2x3hyr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-24 19:10:42 +0100
message:
Prepare TestLoader for specialization.
* bzrlib/tests/test_selftest.py:
(TestTestLoader): Add tests for loadTestsFromModuleName.
* bzrlib/tests/TestUtil.py:
(TestLoader.loadTestsFromModuleName): New method allowing
specialization by daughter classes.
modified:
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.7.2
revision-id: v.ladeuil+lp at free.fr-20080324174247-ngn30tddzl2x3hyr
parent: v.ladeuil+lp at free.fr-20080324173652-foz4lhkjdpzjmsvg
parent: v.ladeuil+lp at free.fr-20080324173652-foz4lhkjdpzjmsvg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filter-by-module-test-loader
timestamp: Mon 2008-03-24 18:42:47 +0100
message:
merge down-thread
------------------------------------------------------------
revno: 3302.7.1
revision-id: v.ladeuil+lp at free.fr-20080324173652-foz4lhkjdpzjmsvg
parent: v.ladeuil+lp at free.fr-20080324154444-38ox0sd3t1er995r
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-24 18:36:52 +0100
message:
Extract _test_ids helper for reuse by other test classes.
* bzrlib/tests/test_selftest.py:
(_test_ids): Needed by several test classes. Extracted from
TestSelftestFiltering.
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
-------------- next part --------------
=== modified file 'bzrlib/tests/TestUtil.py'
--- a/bzrlib/tests/TestUtil.py 2008-01-07 16:47:46 +0000
+++ b/bzrlib/tests/TestUtil.py 2008-03-26 08:10:01 +0000
@@ -89,8 +89,14 @@
"""
result = self.suiteClass()
for name in names:
- module = _load_module_by_name(name)
- result.addTests(self.loadTestsFromModule(module))
+ result.addTests(self.loadTestsFromModuleName(name))
+ return result
+
+ def loadTestsFromModuleName(self, name):
+ result = self.suiteClass()
+ module = _load_module_by_name(name)
+
+ result.addTests(self.loadTestsFromModule(module))
return result
def loadTestsFromModule(self, module):
@@ -127,7 +133,7 @@
def getTestCaseNames(self, test_case_class):
test_fn_names = self.test_func_names.get(test_case_class, None)
if test_fn_names is not None:
- # We already calculate that
+ # We already know them
return test_fn_names
test_fn_names = unittest.TestLoader.getTestCaseNames(self,
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-03-27 14:57:07 +0000
+++ b/bzrlib/tests/__init__.py 2008-03-31 17:20:08 +0000
@@ -109,7 +109,6 @@
default_transport = LocalURLServer
-MODULES_TO_TEST = []
MODULES_TO_DOCTEST = [
bzrlib,
bzrlib.timestamp,
@@ -2849,14 +2848,6 @@
pack_suite = filter_suite_by_id_list(pack_suite, id_filter)
suite.addTest(pack_suite)
- # 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)]:
- mod_suite = loader.loadTestsFromModule(mod)
- if keep_only is not None:
- mod_suite = filter_suite_by_id_list(mod_suite, id_filter)
- suite.addTest(mod_suite)
-
for mod in MODULES_TO_DOCTEST:
try:
doc_suite = doctest.DocTestSuite(mod)
@@ -2900,7 +2891,7 @@
return suite
-def multiply_tests_from_modules(module_name_list, scenario_iter):
+def multiply_tests_from_modules(module_name_list, scenario_iter, loader=None):
"""Adapt all tests in some given modules to given scenarios.
This is the recommended public interface for test parameterization.
@@ -2912,6 +2903,8 @@
modules.
:param scenario_iter: Iterable of pairs of (scenario_name,
scenario_param_dict).
+ :param loader: If provided, will be used instead of a new
+ bzrlib.tests.TestLoader() instance.
This returns a new TestSuite containing the cross product of
all the tests in all the modules, each repeated for each scenario.
@@ -2933,8 +2926,13 @@
>>> tests[1].param
2
"""
- loader = TestLoader()
- suite = TestSuite()
+ # XXX: Isn't load_tests() a better way to provide the same functionality
+ # without forcing a predefined TestScenarioApplier ? --vila 080215
+ if loader is None:
+ loader = TestUtil.TestLoader()
+
+ suite = loader.suiteClass()
+
adapter = TestScenarioApplier()
adapter.scenarios = list(scenario_iter)
adapt_modules(module_name_list, adapter, loader, suite)
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2008-03-26 21:43:31 +0000
+++ b/bzrlib/tests/test_selftest.py 2008-03-26 21:43:57 +0000
@@ -77,6 +77,11 @@
from bzrlib.version import _get_bzr_source_tree
+def _test_ids(test_suite):
+ """Get the ids for the tests in a test suite."""
+ return [t.id() for t in iter_suite_tests(test_suite)]
+
+
class SelftestTests(TestCase):
def test_import_tests(self):
@@ -1723,18 +1728,14 @@
self.loader = TestUtil.TestLoader()
self.suite.addTest(self.loader.loadTestsFromModuleNames([
'bzrlib.tests.test_selftest']))
- self.all_names = self._test_ids(self.suite)
-
- def _test_ids(self, test_suite):
- """Get the ids for the tests in a test suite."""
- return [t.id() for t in iter_suite_tests(test_suite)]
+ self.all_names = _test_ids(self.suite)
def test_condition_id_re(self):
test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
'test_condition_id_re')
filtered_suite = filter_suite_by_condition(self.suite,
condition_id_re('test_condition_id_re'))
- self.assertEqual([test_name], self._test_ids(filtered_suite))
+ self.assertEqual([test_name], _test_ids(filtered_suite))
def test_condition_id_in_list(self):
test_names = ['bzrlib.tests.test_selftest.TestSelftestFiltering.'
@@ -1744,16 +1745,14 @@
self.suite, tests.condition_id_in_list(id_list))
my_pattern = 'TestSelftestFiltering.*test_condition_id_in_list'
re_filtered = filter_suite_by_re(self.suite, my_pattern)
- self.assertEqual(self._test_ids(re_filtered),
- self._test_ids(filtered_suite))
+ self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite))
def test_condition_isinstance(self):
filtered_suite = filter_suite_by_condition(self.suite,
condition_isinstance(self.__class__))
class_pattern = 'bzrlib.tests.test_selftest.TestSelftestFiltering.'
re_filtered = filter_suite_by_re(self.suite, class_pattern)
- self.assertEqual(self._test_ids(re_filtered),
- self._test_ids(filtered_suite))
+ self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite))
def test_exclude_tests_by_condition(self):
excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
@@ -1762,33 +1761,33 @@
lambda x:x.id() == excluded_name)
self.assertEqual(len(self.all_names) - 1,
filtered_suite.countTestCases())
- self.assertFalse(excluded_name in self._test_ids(filtered_suite))
+ self.assertFalse(excluded_name in _test_ids(filtered_suite))
remaining_names = list(self.all_names)
remaining_names.remove(excluded_name)
- self.assertEqual(remaining_names, self._test_ids(filtered_suite))
+ self.assertEqual(remaining_names, _test_ids(filtered_suite))
def test_exclude_tests_by_re(self):
- self.all_names = self._test_ids(self.suite)
+ self.all_names = _test_ids(self.suite)
filtered_suite = exclude_tests_by_re(self.suite, 'exclude_tests_by_re')
excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
'test_exclude_tests_by_re')
self.assertEqual(len(self.all_names) - 1,
filtered_suite.countTestCases())
- self.assertFalse(excluded_name in self._test_ids(filtered_suite))
+ self.assertFalse(excluded_name in _test_ids(filtered_suite))
remaining_names = list(self.all_names)
remaining_names.remove(excluded_name)
- self.assertEqual(remaining_names, self._test_ids(filtered_suite))
+ self.assertEqual(remaining_names, _test_ids(filtered_suite))
def test_filter_suite_by_condition(self):
test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
'test_filter_suite_by_condition')
filtered_suite = filter_suite_by_condition(self.suite,
lambda x:x.id() == test_name)
- self.assertEqual([test_name], self._test_ids(filtered_suite))
+ self.assertEqual([test_name], _test_ids(filtered_suite))
def test_filter_suite_by_re(self):
filtered_suite = filter_suite_by_re(self.suite, 'test_filter_suite_by_r')
- filtered_names = self._test_ids(filtered_suite)
+ filtered_names = _test_ids(filtered_suite)
self.assertEqual(filtered_names, ['bzrlib.tests.test_selftest.'
'TestSelftestFiltering.test_filter_suite_by_re'])
@@ -1797,7 +1796,7 @@
'TestSelftestFiltering.test_filter_suite_by_id_list']
filtered_suite = tests.filter_suite_by_id_list(
self.suite, tests.TestIdList(test_list))
- filtered_names = self._test_ids(filtered_suite)
+ filtered_names = _test_ids(filtered_suite)
self.assertEqual(
filtered_names,
['bzrlib.tests.test_selftest.'
@@ -1811,37 +1810,36 @@
def test_randomize_suite(self):
randomized_suite = randomize_suite(self.suite)
# randomizing should not add or remove test names.
- self.assertEqual(set(self._test_ids(self.suite)),
- set(self._test_ids(randomized_suite)))
+ self.assertEqual(set(_test_ids(self.suite)),
+ set(_test_ids(randomized_suite)))
# Technically, this *can* fail, because random.shuffle(list) can be
# equal to list. Trying multiple times just pushes the frequency back.
# As its len(self.all_names)!:1, the failure frequency should be low
# enough to ignore. RBC 20071021.
# It should change the order.
- self.assertNotEqual(self.all_names, self._test_ids(randomized_suite))
+ self.assertNotEqual(self.all_names, _test_ids(randomized_suite))
# But not the length. (Possibly redundant with the set test, but not
# necessarily.)
- self.assertEqual(len(self.all_names),
- len(self._test_ids(randomized_suite)))
+ self.assertEqual(len(self.all_names), len(_test_ids(randomized_suite)))
def test_sort_suite_by_re(self):
sorted_suite = self.applyDeprecated(one_zero,
sort_suite_by_re, self.suite, 'test_filter_suite_by_r')
- sorted_names = self._test_ids(sorted_suite)
+ sorted_names = _test_ids(sorted_suite)
self.assertEqual(sorted_names[0], 'bzrlib.tests.test_selftest.'
'TestSelftestFiltering.test_filter_suite_by_re')
self.assertEquals(sorted(self.all_names), sorted(sorted_names))
def test_split_suit_by_re(self):
- self.all_names = self._test_ids(self.suite)
+ self.all_names = _test_ids(self.suite)
split_suite = split_suite_by_re(self.suite, 'test_filter_suite_by_r')
filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
'test_filter_suite_by_re')
- self.assertEqual([filtered_name], self._test_ids(split_suite[0]))
- self.assertFalse(filtered_name in self._test_ids(split_suite[1]))
+ self.assertEqual([filtered_name], _test_ids(split_suite[0]))
+ self.assertFalse(filtered_name in _test_ids(split_suite[1]))
remaining_names = list(self.all_names)
remaining_names.remove(filtered_name)
- self.assertEqual(remaining_names, self._test_ids(split_suite[1]))
+ self.assertEqual(remaining_names, _test_ids(split_suite[1]))
class TestCheckInventoryShape(TestCaseWithTransport):
@@ -1918,6 +1916,16 @@
module.__class__.load_tests = load_tests
self.assertEqual(2, loader.loadTestsFromModule(module).countTestCases())
+ def test_load_tests_from_module_name_smoke_test(self):
+ loader = TestUtil.TestLoader()
+ suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
+ self.assertEquals(['bzrlib.tests.test_sampler.DemoTest.test_nothing'],
+ _test_ids(suite))
+
+ def test_load_tests_from_module_name_with_bogus_module_name(self):
+ loader = TestUtil.TestLoader()
+ self.assertRaises(ImportError, loader.loadTestsFromModuleName, 'bogus')
+
class TestTestIdList(tests.TestCase):
@@ -1991,12 +1999,11 @@
# --no-plugins
]
suite = tests.test_suite(test_list)
- self.assertEquals(test_list, self._test_ids(suite))
+ self.assertEquals(test_list, _test_ids(suite))
def test_test_suite_matches_id_list_with_unknown(self):
loader = TestUtil.TestLoader()
- import bzrlib.tests.test_sampler
- suite = loader.loadTestsFromModule(bzrlib.tests.test_sampler)
+ suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing',
'bogus']
not_found, duplicates = tests.suite_matches_id_list(suite, test_list)
@@ -2005,8 +2012,7 @@
def test_suite_matches_id_list_with_duplicates(self):
loader = TestUtil.TestLoader()
- import bzrlib.tests.test_sampler
- suite = loader.loadTestsFromModule(bzrlib.tests.test_sampler)
+ suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
dupes = loader.suiteClass()
for test in iter_suite_tests(suite):
dupes.addTest(test)
More information about the bazaar-commits
mailing list