Rev 2474: Switch over some of the adapter tests to auto load. in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/test_autoloader

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/test_autoloader

------------------------------------------------------------
revno: 2474
revision-id: john at arbash-meinel.com-20070427221911-ehmmqy22jijis3ko
parent: john at arbash-meinel.com-20070427221319-cgg2710ohtd0f5e1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_autoloader
timestamp: Fri 2007-04-27 17:19:11 -0500
message:
  Switch over some of the adapter tests to auto load.
modified:
  bzrlib/tests/blackbox/encoding_tests/__init__.py __init__.py-20070427205653-dxoru4wmr60nyag0-1
  bzrlib/tests/transport_implementations/__init__.py __init__.py-20070427204159-rs104bugblkajzg0-1
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/encoding_tests/__init__.py'
--- a/bzrlib/tests/blackbox/encoding_tests/__init__.py	2007-04-27 21:19:20 +0000
+++ b/bzrlib/tests/blackbox/encoding_tests/__init__.py	2007-04-27 22:19:11 +0000
@@ -16,18 +16,18 @@
 
 """Blackbox encoding tests."""
 
+import os
+
 from bzrlib import tests
 from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
 
 
 def test_suite():
-    test_encodings = [
-        'bzrlib.tests.blackbox.encoding_tests.test_non_ascii',
-    ]
-
     loader = tests.TestLoader()
     suite = tests.TestSuite()
+    modules, packages = loader.findTestModules(os.path.dirname(__file__), __name__)
 
     adapter = EncodingTestAdapter()
-    tests.adapt_modules(test_encodings, adapter, loader, suite)
+    tests.adapt_modules(modules, adapter, loader, suite)
+    suite.addTests(loader.loadTestsFromPackageNames(packages))
     return suite

=== modified file 'bzrlib/tests/transport_implementations/__init__.py'
--- a/bzrlib/tests/transport_implementations/__init__.py	2007-04-27 20:42:11 +0000
+++ b/bzrlib/tests/transport_implementations/__init__.py	2007-04-27 22:19:11 +0000
@@ -16,17 +16,17 @@
 
 """Tests for Transport implementations."""
 
+import os
+
 from bzrlib import tests
 
 
 def test_suite():
     from bzrlib.transport import TransportTestProviderAdapter
-    test_transport_implementations = [
-        'bzrlib.tests.transport_implementations.test_transport_implementations',
-        'bzrlib.tests.transport_implementations.test_read_bundle',
-        ]
     suite = tests.TestSuite()
     loader = tests.TestLoader()
     adapter = TransportTestProviderAdapter()
-    tests.adapt_modules(test_transport_implementations, adapter, loader, suite)
+    modules, packages = loader.findTestModules(os.path.dirname(__file__), __name__)
+    tests.adapt_modules(modules, adapter, loader, suite)
+    suite.addTests(loader.loadTestsFromPackageNames(packages))
     return suite

=== modified file 'bzrlib/tests/workingtree_implementations/__init__.py'
--- a/bzrlib/tests/workingtree_implementations/__init__.py	2007-04-18 20:12:15 +0000
+++ b/bzrlib/tests/workingtree_implementations/__init__.py	2007-04-27 22:19:11 +0000
@@ -22,6 +22,8 @@
 rather than in tests/workingtree_implementations/*.py.
 """
 
+import os
+
 import bzrlib.errors as errors
 from bzrlib.transport import get_transport
 from bzrlib.tests import (
@@ -48,41 +50,6 @@
 
 def test_suite():
     result = TestSuite()
-    test_workingtree_implementations = [
-        'bzrlib.tests.workingtree_implementations.test_add_reference',
-        'bzrlib.tests.workingtree_implementations.test_add',
-        'bzrlib.tests.workingtree_implementations.test_basis_inventory',
-        'bzrlib.tests.workingtree_implementations.test_basis_tree',
-        'bzrlib.tests.workingtree_implementations.test_break_lock',
-        'bzrlib.tests.workingtree_implementations.test_changes_from',
-        'bzrlib.tests.workingtree_implementations.test_commit',
-        'bzrlib.tests.workingtree_implementations.test_executable',
-        'bzrlib.tests.workingtree_implementations.test_flush',
-        'bzrlib.tests.workingtree_implementations.test_get_file_mtime',
-        'bzrlib.tests.workingtree_implementations.test_get_parent_ids',
-        'bzrlib.tests.workingtree_implementations.test_inv',
-        'bzrlib.tests.workingtree_implementations.test_is_control_filename',
-        'bzrlib.tests.workingtree_implementations.test_is_ignored',
-        'bzrlib.tests.workingtree_implementations.test_locking',
-        'bzrlib.tests.workingtree_implementations.test_merge_from_branch',
-        'bzrlib.tests.workingtree_implementations.test_mkdir',
-        'bzrlib.tests.workingtree_implementations.test_move',
-        'bzrlib.tests.workingtree_implementations.test_nested_specifics',
-        'bzrlib.tests.workingtree_implementations.test_parents',
-        'bzrlib.tests.workingtree_implementations.test_paths2ids',
-        'bzrlib.tests.workingtree_implementations.test_pull',
-        'bzrlib.tests.workingtree_implementations.test_put_file',
-        'bzrlib.tests.workingtree_implementations.test_readonly',
-        'bzrlib.tests.workingtree_implementations.test_read_working_inventory',
-        'bzrlib.tests.workingtree_implementations.test_remove',
-        'bzrlib.tests.workingtree_implementations.test_rename_one',
-        'bzrlib.tests.workingtree_implementations.test_revision_tree',
-        'bzrlib.tests.workingtree_implementations.test_set_root_id',
-        'bzrlib.tests.workingtree_implementations.test_smart_add',
-        'bzrlib.tests.workingtree_implementations.test_unversion',
-        'bzrlib.tests.workingtree_implementations.test_walkdirs',
-        'bzrlib.tests.workingtree_implementations.test_workingtree',
-        ]
     adapter = WorkingTreeTestProviderAdapter(
         default_transport,
         # None here will cause a readonly decorator to be created
@@ -91,5 +58,7 @@
         [(format, format._matchingbzrdir) for format in 
          WorkingTreeFormat._formats.values() + _legacy_formats])
     loader = TestLoader()
-    adapt_modules(test_workingtree_implementations, adapter, loader, result)
+    modules, packages = loader.findTestModules(os.path.dirname(__file__), __name__)
+    adapt_modules(modules, adapter, loader, result)
+    result.addTests(loader.loadTestsFromPackageNames(packages))
     return result