Rev 2476: Turn the rest of the adapted tests over to using load_and_adapt_modules() in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/test_autoloader
John Arbash Meinel
john at arbash-meinel.com
Fri Apr 27 23:53:37 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/test_autoloader
------------------------------------------------------------
revno: 2476
revision-id: john at arbash-meinel.com-20070427225319-x1wda20od2o5foh8
parent: john at arbash-meinel.com-20070427223214-8ut70ar9op2qz7zm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_autoloader
timestamp: Fri 2007-04-27 17:53:19 -0500
message:
Turn the rest of the adapted tests over to using load_and_adapt_modules()
modified:
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
-------------- next part --------------
=== modified file 'bzrlib/tests/branch_implementations/__init__.py'
--- a/bzrlib/tests/branch_implementations/__init__.py 2007-04-24 19:45:05 +0000
+++ b/bzrlib/tests/branch_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -101,32 +101,10 @@
def test_suite():
- result = tests.TestSuite()
- test_branch_implementations = [
- 'bzrlib.tests.branch_implementations.test_bound_sftp',
- 'bzrlib.tests.branch_implementations.test_branch',
- 'bzrlib.tests.branch_implementations.test_break_lock',
- 'bzrlib.tests.branch_implementations.test_create_checkout',
- 'bzrlib.tests.branch_implementations.test_commit',
- 'bzrlib.tests.branch_implementations.test_get_revision_id_to_revno_map',
- 'bzrlib.tests.branch_implementations.test_hooks',
- 'bzrlib.tests.branch_implementations.test_http',
- 'bzrlib.tests.branch_implementations.test_last_revision_info',
- 'bzrlib.tests.branch_implementations.test_locking',
- 'bzrlib.tests.branch_implementations.test_parent',
- 'bzrlib.tests.branch_implementations.test_permissions',
- 'bzrlib.tests.branch_implementations.test_pull',
- 'bzrlib.tests.branch_implementations.test_push',
- 'bzrlib.tests.branch_implementations.test_revision_history',
- 'bzrlib.tests.branch_implementations.test_revision_id_to_revno',
- 'bzrlib.tests.branch_implementations.test_tags',
- 'bzrlib.tests.branch_implementations.test_uncommit',
- 'bzrlib.tests.branch_implementations.test_update',
- ]
# Generate a list of branch formats and their associated bzrdir formats to
# use.
- combinations = [(format, format._matchingbzrdir) for format in
- BranchFormat._formats.values() + _legacy_formats]
+ combinations = [(format, format._matchingbzrdir) for format in
+ BranchFormat._formats.values() + _legacy_formats]
adapter = BranchTestProviderAdapter(
# None here will cause the default vfs transport server to be used.
None,
@@ -134,8 +112,7 @@
# by the TestCaseWithTransport.get_readonly_transport method.
None,
combinations)
- loader = tests.TestLoader()
- tests.adapt_modules(test_branch_implementations, adapter, loader, result)
+ suite = tests.load_and_adapt_modules(adapter, __file__, __name__)
adapt_to_smart_server = BranchTestProviderAdapter(
SmartTCPServer_for_testing,
@@ -143,9 +120,7 @@
[(RemoteBranchFormat(), RemoteBzrDirFormat())],
MemoryServer
)
- tests.adapt_modules(test_branch_implementations,
- adapt_to_smart_server,
- loader,
- result)
+ suite.addTests(tests.load_and_adapt_modules(adapt_to_smart_server,
+ __file__, __name__))
+ return suite
- return result
=== modified file 'bzrlib/tests/bzrdir_implementations/__init__.py'
--- a/bzrlib/tests/bzrdir_implementations/__init__.py 2007-04-17 09:16:29 +0000
+++ b/bzrlib/tests/bzrdir_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -28,6 +28,7 @@
from bzrlib.tests import (
adapt_modules,
default_transport,
+ load_and_adapt_modules,
TestLoader,
TestSuite,
)
@@ -35,10 +36,6 @@
def test_suite():
- result = TestSuite()
- test_bzrdir_implementations = [
- 'bzrlib.tests.bzrdir_implementations.test_bzrdir',
- ]
formats = BzrDirFormat.known_formats()
adapter = BzrDirTestProviderAdapter(
default_transport,
@@ -47,8 +44,7 @@
# by the TestCaseWithTransport.get_readonly_transport method.
None,
formats)
- loader = TestLoader()
- adapt_modules(test_bzrdir_implementations, adapter, loader, result)
+ result = load_and_adapt_modules(adapter, __file__, __name__)
# This will always add the tests for smart server transport, regardless of
# the --transport option the user specified to 'bzr selftest'.
@@ -56,16 +52,11 @@
from bzrlib.remote import RemoteBzrDirFormat
# test the remote server behaviour using a MemoryTransport
- smart_server_suite = TestSuite()
adapt_to_smart_server = BzrDirTestProviderAdapter(
MemoryServer,
SmartTCPServer_for_testing,
ReadonlySmartTCPServer_for_testing,
[(RemoteBzrDirFormat())])
- adapt_modules(test_bzrdir_implementations,
- adapt_to_smart_server,
- TestLoader(),
- smart_server_suite)
- result.addTests(smart_server_suite)
-
+ result.addTests(load_and_adapt_modules(adapt_to_smart_server,
+ __file__, __name__))
return result
=== modified file 'bzrlib/tests/interrepository_implementations/__init__.py'
--- a/bzrlib/tests/interrepository_implementations/__init__.py 2007-02-06 06:27:24 +0000
+++ b/bzrlib/tests/interrepository_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -28,20 +28,14 @@
from bzrlib.repository import (
InterRepositoryTestProviderAdapter,
)
-
+
from bzrlib.tests import (
- adapt_modules,
default_transport,
- TestLoader,
- TestSuite,
+ load_and_adapt_modules,
)
def test_suite():
- result = TestSuite()
- test_interrepository_implementations = [
- 'bzrlib.tests.interrepository_implementations.test_interrepository',
- ]
adapter = InterRepositoryTestProviderAdapter(
default_transport,
# None here will cause a readonly decorator to be created
@@ -49,6 +43,4 @@
None,
InterRepositoryTestProviderAdapter.default_test_list()
)
- loader = TestLoader()
- adapt_modules(test_interrepository_implementations, adapter, loader, result)
- return result
+ return load_and_adapt_modules(adapter, __file__, __name__)
=== modified file 'bzrlib/tests/intertree_implementations/__init__.py'
--- a/bzrlib/tests/intertree_implementations/__init__.py 2007-03-02 09:44:41 +0000
+++ b/bzrlib/tests/intertree_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -22,17 +22,13 @@
- tests/test_workingtree.py
"""
-import bzrlib.errors as errors
-from bzrlib.transport import get_transport
from bzrlib.tests import (
- adapt_modules,
default_transport,
- TestLoader,
+ load_and_adapt_modules,
TestSuite,
)
from bzrlib.tests.tree_implementations import (
return_parameter,
- revision_tree_from_workingtree,
TestCaseWithTree,
)
from bzrlib.tree import InterTree
@@ -85,15 +81,7 @@
def test_suite():
- result = TestSuite()
- loader = TestLoader()
- # load the tests of the infrastructure for these tests
- result.addTests(loader.loadTestsFromModuleNames(['bzrlib.tests.intertree_implementations']))
-
default_tree_format = WorkingTreeFormat3()
- test_intertree_implementations = [
- 'bzrlib.tests.intertree_implementations.test_compare',
- ]
test_intertree_permutations = [
# test InterTree with two default-format working trees.
(InterTree, default_tree_format, default_tree_format,
@@ -110,5 +98,4 @@
# by the TestCaseWithTransport.get_readonly_transport method.
None,
test_intertree_permutations)
- adapt_modules(test_intertree_implementations, adapter, loader, result)
- return result
+ return load_and_adapt_modules(adapter, __file__, __name__)
=== modified file 'bzrlib/tests/interversionedfile_implementations/__init__.py'
--- a/bzrlib/tests/interversionedfile_implementations/__init__.py 2006-10-11 23:08:27 +0000
+++ b/bzrlib/tests/interversionedfile_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -25,20 +25,13 @@
"""
from bzrlib.versionedfile import InterVersionedFileTestProviderAdapter
-
from bzrlib.tests import (
- adapt_modules,
default_transport,
- TestLoader,
- TestSuite,
+ load_and_adapt_modules,
)
def test_suite():
- result = TestSuite()
- test_interversionedfile_implementations = [
- 'bzrlib.tests.interversionedfile_implementations.test_join',
- ]
adapter = InterVersionedFileTestProviderAdapter(
default_transport,
# None here will cause a readonly decorator to be created
@@ -46,6 +39,4 @@
None,
InterVersionedFileTestProviderAdapter.default_test_list()
)
- loader = TestLoader()
- adapt_modules(test_interversionedfile_implementations, adapter, loader, result)
- return result
+ return load_and_adapt_modules(adapter, __file__, __name__)
=== modified file 'bzrlib/tests/per_lock/__init__.py'
--- a/bzrlib/tests/per_lock/__init__.py 2007-03-14 23:40:34 +0000
+++ b/bzrlib/tests/per_lock/__init__.py 2007-04-27 22:53:19 +0000
@@ -64,12 +64,5 @@
def test_suite():
- result = tests.TestSuite()
- test_lock_implementations = [
- 'bzrlib.tests.per_lock.test_lock',
- 'bzrlib.tests.per_lock.test_temporary_write_lock',
- ]
adapter = LockTestProviderAdapter(lock._lock_classes)
- loader = tests.TestLoader()
- tests.adapt_modules(test_lock_implementations, adapter, loader, result)
- return result
+ return tests.load_and_adapt_modules(adapter, __file__, __name__)
=== modified file 'bzrlib/tests/repository_implementations/__init__.py'
--- a/bzrlib/tests/repository_implementations/__init__.py 2007-03-13 06:55:43 +0000
+++ b/bzrlib/tests/repository_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -34,27 +34,13 @@
weaverepo,
)
from bzrlib.tests import (
- adapt_modules,
default_transport,
- TestLoader,
- TestSuite,
+ load_and_adapt_modules,
)
from bzrlib.transport.memory import MemoryServer
def test_suite():
- result = TestSuite()
- test_repository_implementations = [
- 'bzrlib.tests.repository_implementations.test_break_lock',
- 'bzrlib.tests.repository_implementations.test_commit_builder',
- 'bzrlib.tests.repository_implementations.test_fileid_involved',
- 'bzrlib.tests.repository_implementations.test_iter_reverse_revision_history',
- 'bzrlib.tests.repository_implementations.test_reconcile',
- 'bzrlib.tests.repository_implementations.test_repository',
- 'bzrlib.tests.repository_implementations.test_revision',
- 'bzrlib.tests.repository_implementations.test_statistics',
- ]
-
from bzrlib.smart.server import (
SmartTCPServer_for_testing,
ReadonlySmartTCPServer_for_testing,
@@ -70,8 +56,7 @@
# by the TestCaseWithTransport.get_readonly_transport method.
None,
[(format, format._matchingbzrdir) for format in all_formats])
- loader = TestLoader()
- adapt_modules(test_repository_implementations, adapter, loader, result)
+ result = load_and_adapt_modules(adapter, __file__, __name__)
adapt_to_smart_server = RepositoryTestProviderAdapter(
SmartTCPServer_for_testing,
@@ -79,9 +64,6 @@
[(RemoteRepositoryFormat(), RemoteBzrDirFormat())],
MemoryServer
)
- adapt_modules(test_repository_implementations,
- adapt_to_smart_server,
- loader,
- result)
-
+ result.addTests(load_and_adapt_modules(adapt_to_smart_server,
+ __file__, __name__))
return result
=== modified file 'bzrlib/tests/revisionstore_implementations/__init__.py'
--- a/bzrlib/tests/revisionstore_implementations/__init__.py 2006-10-11 23:08:27 +0000
+++ b/bzrlib/tests/revisionstore_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -25,20 +25,13 @@
"""
from bzrlib.store.revision import RevisionStoreTestProviderAdapter
-
from bzrlib.tests import (
- adapt_modules,
default_transport,
- TestLoader,
- TestSuite,
+ load_and_adapt_modules,
)
def test_suite():
- result = TestSuite()
- test_revisionstore_implementations = [
- 'bzrlib.tests.revisionstore_implementations.test_all',
- ]
adapter = RevisionStoreTestProviderAdapter(
default_transport,
# None here will cause a readonly decorator to be created
@@ -46,6 +39,4 @@
None,
RevisionStoreTestProviderAdapter.default_test_list()
)
- loader = TestLoader()
- adapt_modules(test_revisionstore_implementations, adapter, loader, result)
- return result
+ return load_and_adapt_modules(adapter, __file__, __name__)
=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- a/bzrlib/tests/tree_implementations/__init__.py 2007-04-16 20:42:59 +0000
+++ b/bzrlib/tests/tree_implementations/__init__.py 2007-04-27 22:53:19 +0000
@@ -33,12 +33,11 @@
)
from bzrlib.transport import get_transport
from bzrlib.tests import (
- adapt_modules,
default_transport,
+ load_and_adapt_modules,
TestCaseWithTransport,
TestLoader,
TestSkipped,
- TestSuite,
)
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
from bzrlib.revisiontree import RevisionTree
@@ -321,25 +320,14 @@
def test_suite():
- result = TestSuite()
- test_tree_implementations = [
- 'bzrlib.tests.tree_implementations.test_get_file_mtime',
- 'bzrlib.tests.tree_implementations.test_get_symlink_target',
- 'bzrlib.tests.tree_implementations.test_inv',
- 'bzrlib.tests.tree_implementations.test_list_files',
- 'bzrlib.tests.tree_implementations.test_revision_tree',
- 'bzrlib.tests.tree_implementations.test_test_trees',
- 'bzrlib.tests.tree_implementations.test_tree',
- 'bzrlib.tests.tree_implementations.test_walkdirs',
- ]
adapter = TreeTestProviderAdapter(
default_transport,
# None here will cause a readonly decorator to be created
# by the TestCaseWithTransport.get_readonly_transport method.
None,
- [(format, format._matchingbzrdir) for format in
+ [(format, format._matchingbzrdir) for format in
WorkingTreeFormat._formats.values() + _legacy_formats])
+ result = load_and_adapt_modules(adapter, __file__, __name__)
loader = TestLoader()
- adapt_modules(test_tree_implementations, adapter, loader, result)
result.addTests(loader.loadTestsFromModuleNames(['bzrlib.tests.tree_implementations']))
return result
More information about the bazaar-commits
mailing list