Rev 2470: Switching blackbox tests to auto load. in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/test_autoloader
John Arbash Meinel
john at arbash-meinel.com
Fri Apr 27 22:03:38 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/test_autoloader
------------------------------------------------------------
revno: 2470
revision-id: john at arbash-meinel.com-20070427210323-ug6uj12wfbi2xh7x
parent: john at arbash-meinel.com-20070427204734-cu01eyltmmchxe4n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_autoloader
timestamp: Fri 2007-04-27 16:03:23 -0500
message:
Switching blackbox tests to auto load.
We seem to find more tests, will investigate.
added:
bzrlib/tests/blackbox/encoding_tests/ bzrlibtestsblackboxe-20070427204927-7fp6a9z3wcmi98dp-1
bzrlib/tests/blackbox/encoding_tests/__init__.py __init__.py-20070427205653-dxoru4wmr60nyag0-1
renamed:
bzrlib/tests/blackbox/test_non_ascii.py => bzrlib/tests/blackbox/encoding_tests/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
modified:
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
-------------- next part --------------
=== added directory 'bzrlib/tests/blackbox/encoding_tests'
=== added file 'bzrlib/tests/blackbox/encoding_tests/__init__.py'
--- a/bzrlib/tests/blackbox/encoding_tests/__init__.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/blackbox/encoding_tests/__init__.py 2007-04-27 21:03:23 +0000
@@ -0,0 +1,33 @@
+# Copyright (C) 2007 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""Blackbox encoding tests."""
+
+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 = loader.loadTestsFromModuleNames(test_encodings)
+
+ adapter = EncodingTestAdapter()
+ tests.adapt_modules(test_encodings, adapter, loader, suite)
+ return suite
=== renamed file 'bzrlib/tests/blackbox/test_non_ascii.py' => 'bzrlib/tests/blackbox/encoding_tests/test_non_ascii.py'
=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- a/bzrlib/tests/blackbox/__init__.py 2007-04-25 06:50:22 +0000
+++ b/bzrlib/tests/blackbox/__init__.py 2007-04-27 21:03:23 +0000
@@ -22,101 +22,21 @@
rather starts again from the run_bzr function.
"""
+import os
import sys
-from bzrlib.tests import (
- adapt_modules,
- TestCaseWithTransport,
- TestSuite,
- TestLoader,
- iter_suite_tests,
- )
-from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
-import bzrlib.ui as ui
+from bzrlib import (
+ tests,
+ ui,
+ )
def test_suite():
- testmod_names = [
- 'bzrlib.tests.blackbox.test_add',
- 'bzrlib.tests.blackbox.test_added',
- 'bzrlib.tests.blackbox.test_aliases',
- 'bzrlib.tests.blackbox.test_ancestry',
- 'bzrlib.tests.blackbox.test_annotate',
- 'bzrlib.tests.blackbox.test_branch',
- 'bzrlib.tests.blackbox.test_break_lock',
- 'bzrlib.tests.blackbox.test_breakin',
- 'bzrlib.tests.blackbox.test_bound_branches',
- 'bzrlib.tests.blackbox.test_bundle',
- 'bzrlib.tests.blackbox.test_cat',
- 'bzrlib.tests.blackbox.test_cat_revision',
- 'bzrlib.tests.blackbox.test_checkout',
- 'bzrlib.tests.blackbox.test_command_encoding',
- 'bzrlib.tests.blackbox.test_commit',
- 'bzrlib.tests.blackbox.test_conflicts',
- 'bzrlib.tests.blackbox.test_debug',
- 'bzrlib.tests.blackbox.test_diff',
- 'bzrlib.tests.blackbox.test_exceptions',
- 'bzrlib.tests.blackbox.test_export',
- 'bzrlib.tests.blackbox.test_find_merge_base',
- 'bzrlib.tests.blackbox.test_help',
- 'bzrlib.tests.blackbox.test_ignore',
- 'bzrlib.tests.blackbox.test_ignored',
- 'bzrlib.tests.blackbox.test_info',
- 'bzrlib.tests.blackbox.test_init',
- 'bzrlib.tests.blackbox.test_inventory',
- 'bzrlib.tests.blackbox.test_join',
- 'bzrlib.tests.blackbox.test_locale',
- 'bzrlib.tests.blackbox.test_log',
- 'bzrlib.tests.blackbox.test_logformats',
- 'bzrlib.tests.blackbox.test_ls',
- 'bzrlib.tests.blackbox.test_merge',
- 'bzrlib.tests.blackbox.test_merge_directive',
- 'bzrlib.tests.blackbox.test_missing',
- 'bzrlib.tests.blackbox.test_mv',
- 'bzrlib.tests.blackbox.test_nick',
- 'bzrlib.tests.blackbox.test_outside_wt',
- 'bzrlib.tests.blackbox.test_pull',
- 'bzrlib.tests.blackbox.test_push',
- 'bzrlib.tests.blackbox.test_reconcile',
- 'bzrlib.tests.blackbox.test_remerge',
- 'bzrlib.tests.blackbox.test_remove',
- 'bzrlib.tests.blackbox.test_re_sign',
- 'bzrlib.tests.blackbox.test_remove_tree',
- 'bzrlib.tests.blackbox.test_revert',
- 'bzrlib.tests.blackbox.test_revno',
- 'bzrlib.tests.blackbox.test_revision_history',
- 'bzrlib.tests.blackbox.test_revision_info',
- 'bzrlib.tests.blackbox.test_selftest',
- 'bzrlib.tests.blackbox.test_serve',
- 'bzrlib.tests.blackbox.test_shared_repository',
- 'bzrlib.tests.blackbox.test_sign_my_commits',
- 'bzrlib.tests.blackbox.test_split',
- 'bzrlib.tests.blackbox.test_status',
- 'bzrlib.tests.blackbox.test_tags',
- 'bzrlib.tests.blackbox.test_testament',
- 'bzrlib.tests.blackbox.test_too_much',
- 'bzrlib.tests.blackbox.test_uncommit',
- 'bzrlib.tests.blackbox.test_update',
- 'bzrlib.tests.blackbox.test_upgrade',
- 'bzrlib.tests.blackbox.test_version',
- 'bzrlib.tests.blackbox.test_version_info',
- 'bzrlib.tests.blackbox.test_versioning',
- 'bzrlib.tests.blackbox.test_whoami',
- ]
- test_encodings = [
- 'bzrlib.tests.blackbox.test_non_ascii',
- ]
-
- loader = TestLoader()
- suite = loader.loadTestsFromModuleNames(testmod_names)
-
- adapter = EncodingTestAdapter()
- adapt_modules(test_encodings, adapter, loader, suite)
-
- return suite
-
-
-class ExternalBase(TestCaseWithTransport):
+ loader = tests.TestLoader()
+ return loader.recursiveLoadTests(os.path.dirname(__file__), __name__)
+
+
+class ExternalBase(tests.TestCaseWithTransport):
def runbzr(self, args, retcode=0, backtick=False):
if isinstance(args, basestring):
=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- a/bzrlib/tests/blackbox/test_cat.py 2007-03-28 14:48:07 +0000
+++ b/bzrlib/tests/blackbox/test_cat.py 2007-04-27 21:03:23 +0000
@@ -21,7 +21,7 @@
import os
-from bzrlib.tests.blackbox import TestCaseWithTransport
+from bzrlib.tests import TestCaseWithTransport
class TestCat(TestCaseWithTransport):
More information about the bazaar-commits
mailing list