Rev 4528: Fixed as asked in review. in file:///home/vila/src/bzr/reviews/per-tests/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Jul 10 11:46:00 BST 2009
At file:///home/vila/src/bzr/reviews/per-tests/
------------------------------------------------------------
revno: 4528
revision-id: v.ladeuil+lp at free.fr-20090710104600-81t8scvfiqlrnwaq
parent: mbp at sourcefrog.net-20090710071402-dga5lhvdup5jeere
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: per-tests
timestamp: Fri 2009-07-10 12:46:00 +0200
message:
Fixed as asked in review.
* bzrlib/tests/per_workingtree/__init__.py:
(load_tests): Remove common prefix.
* bzrlib/tests/per_tree/__init__.py:
(load_tests): Remove common prefix.
* bzrlib/tests/per_branch/__init__.py:
(load_tests): Remove common prefix.
* bzrlib/tests/__init__.py:
(test_suite): Restore module names sorting.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/__init__.py 2009-07-10 10:46:00 +0000
@@ -3333,17 +3333,20 @@
testmod_names = [
'bzrlib.doc',
'bzrlib.tests.blackbox',
+ 'bzrlib.tests.commands',
'bzrlib.tests.per_branch',
'bzrlib.tests.per_bzrdir',
- 'bzrlib.tests.commands',
'bzrlib.tests.per_interrepository',
'bzrlib.tests.per_intertree',
'bzrlib.tests.per_inventory',
'bzrlib.tests.per_interbranch',
'bzrlib.tests.per_lock',
+ 'bzrlib.tests.per_transport',
+ 'bzrlib.tests.per_tree',
'bzrlib.tests.per_repository',
'bzrlib.tests.per_repository_chk',
'bzrlib.tests.per_repository_reference',
+ 'bzrlib.tests.per_workingtree',
'bzrlib.tests.test__annotator',
'bzrlib.tests.test__chk_map',
'bzrlib.tests.test__dirstate_helpers',
@@ -3482,7 +3485,6 @@
'bzrlib.tests.test_transactions',
'bzrlib.tests.test_transform',
'bzrlib.tests.test_transport',
- 'bzrlib.tests.per_transport',
'bzrlib.tests.test_transport_log',
'bzrlib.tests.test_tree',
'bzrlib.tests.test_treebuilder',
@@ -3503,8 +3505,6 @@
'bzrlib.tests.test_workingtree_4',
'bzrlib.tests.test_wsgi',
'bzrlib.tests.test_xml',
- 'bzrlib.tests.per_tree',
- 'bzrlib.tests.per_workingtree',
]
loader = TestUtil.TestLoader()
=== modified file 'bzrlib/tests/per_branch/__init__.py'
--- a/bzrlib/tests/per_branch/__init__.py 2009-07-10 06:45:04 +0000
+++ b/bzrlib/tests/per_branch/__init__.py 2009-07-10 10:46:00 +0000
@@ -163,34 +163,36 @@
def load_tests(standard_tests, module, loader):
- test_per_branch = [
- 'bzrlib.tests.per_branch.test_bound_sftp',
- 'bzrlib.tests.per_branch.test_branch',
- 'bzrlib.tests.per_branch.test_break_lock',
- 'bzrlib.tests.per_branch.test_check',
- 'bzrlib.tests.per_branch.test_create_checkout',
- 'bzrlib.tests.per_branch.test_create_clone',
- 'bzrlib.tests.per_branch.test_commit',
- 'bzrlib.tests.per_branch.test_dotted_revno_to_revision_id',
- 'bzrlib.tests.per_branch.test_get_revision_id_to_revno_map',
- 'bzrlib.tests.per_branch.test_hooks',
- 'bzrlib.tests.per_branch.test_http',
- 'bzrlib.tests.per_branch.test_iter_merge_sorted_revisions',
- 'bzrlib.tests.per_branch.test_last_revision_info',
- 'bzrlib.tests.per_branch.test_locking',
- 'bzrlib.tests.per_branch.test_parent',
- 'bzrlib.tests.per_branch.test_permissions',
- 'bzrlib.tests.per_branch.test_pull',
- 'bzrlib.tests.per_branch.test_push',
- 'bzrlib.tests.per_branch.test_reconcile',
- 'bzrlib.tests.per_branch.test_revision_history',
- 'bzrlib.tests.per_branch.test_revision_id_to_dotted_revno',
- 'bzrlib.tests.per_branch.test_revision_id_to_revno',
- 'bzrlib.tests.per_branch.test_sprout',
- 'bzrlib.tests.per_branch.test_stacking',
- 'bzrlib.tests.per_branch.test_tags',
- 'bzrlib.tests.per_branch.test_uncommit',
- 'bzrlib.tests.per_branch.test_update',
+ per_branch_mod_names = [
+ 'bound_sftp',
+ 'branch',
+ 'break_lock',
+ 'check',
+ 'create_checkout',
+ 'create_clone',
+ 'commit',
+ 'dotted_revno_to_revision_id',
+ 'get_revision_id_to_revno_map',
+ 'hooks',
+ 'http',
+ 'iter_merge_sorted_revisions',
+ 'last_revision_info',
+ 'locking',
+ 'parent',
+ 'permissions',
+ 'pull',
+ 'push',
+ 'reconcile',
+ 'revision_history',
+ 'revision_id_to_dotted_revno',
+ 'revision_id_to_revno',
+ 'sprout',
+ 'stacking',
+ 'tags',
+ 'uncommit',
+ 'update',
]
- sub_tests = loader.loadTestsFromModuleNames(test_per_branch)
+ sub_tests = loader.loadTestsFromModuleNames(
+ ['bzrlib.tests.per_branch.test_' + name
+ for name in per_branch_mod_names])
return tests.multiply_tests(sub_tests, branch_scenarios(), standard_tests)
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py 2009-07-10 05:49:34 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py 2009-07-10 10:46:00 +0000
@@ -43,8 +43,8 @@
import bzrlib.revision
from bzrlib.symbol_versioning import deprecated_in
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
+from bzrlib.tests.http_server import HttpServer
from bzrlib.tests.per_branch import TestCaseWithBranch
-from bzrlib.tests.http_server import HttpServer
from bzrlib.trace import mutter
from bzrlib.transport import get_transport
from bzrlib.transport.memory import MemoryServer
=== modified file 'bzrlib/tests/per_branch/test_http.py'
--- a/bzrlib/tests/per_branch/test_http.py 2009-07-10 05:49:34 +0000
+++ b/bzrlib/tests/per_branch/test_http.py 2009-07-10 10:46:00 +0000
@@ -19,8 +19,8 @@
import os
from bzrlib import branch, errors
+from bzrlib.tests.http_server import HttpServer
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
-from bzrlib.tests.http_server import HttpServer
from bzrlib.transport.local import LocalURLServer
from bzrlib.transport.chroot import TestingChrootServer
=== modified file 'bzrlib/tests/per_branch/test_locking.py'
--- a/bzrlib/tests/per_branch/test_locking.py 2009-07-10 05:49:34 +0000
+++ b/bzrlib/tests/per_branch/test_locking.py 2009-07-10 10:46:00 +0000
@@ -20,8 +20,8 @@
from bzrlib.branch import BzrBranchFormat4
from bzrlib.bzrdir import RemoteBzrDirFormat
from bzrlib.tests import TestSkipped
+from bzrlib.tests.lock_helpers import TestPreventLocking, LockWrapper
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
-from bzrlib.tests.lock_helpers import TestPreventLocking, LockWrapper
class TestBranchLocking(TestCaseWithBranch):
=== modified file 'bzrlib/tests/per_branch/test_tags.py'
--- a/bzrlib/tests/per_branch/test_tags.py 2009-07-10 05:49:34 +0000
+++ b/bzrlib/tests/per_branch/test_tags.py 2009-07-10 10:46:00 +0000
@@ -31,8 +31,7 @@
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
-from bzrlib.tests.per_branch.test_branch \
- import TestCaseWithBranch
+from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
class TestBranchTags(TestCaseWithBranch):
=== modified file 'bzrlib/tests/per_tree/__init__.py'
--- a/bzrlib/tests/per_tree/__init__.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_tree/__init__.py 2009-07-10 10:46:00 +0000
@@ -19,10 +19,10 @@
These test the conformance of all the tree variations to the expected API.
Specific tests for individual variations are in other places such as:
+ - tests/per_workingtree/*.py.
- tests/test_tree.py
- tests/test_revision.py
- tests/test_workingtree.py
- - tests/per_workingtree/*.py.
"""
from bzrlib import (
@@ -362,21 +362,24 @@
def load_tests(standard_tests, module, loader):
- submod_tests = loader.loadTestsFromModuleNames([
- 'bzrlib.tests.per_tree.test_annotate_iter',
- 'bzrlib.tests.per_tree.test_get_file_mtime',
- 'bzrlib.tests.per_tree.test_get_file_with_stat',
- 'bzrlib.tests.per_tree.test_get_root_id',
- 'bzrlib.tests.per_tree.test_get_symlink_target',
- 'bzrlib.tests.per_tree.test_inv',
- 'bzrlib.tests.per_tree.test_iter_search_rules',
- 'bzrlib.tests.per_tree.test_list_files',
- 'bzrlib.tests.per_tree.test_path_content_summary',
- 'bzrlib.tests.per_tree.test_revision_tree',
- 'bzrlib.tests.per_tree.test_test_trees',
- 'bzrlib.tests.per_tree.test_tree',
- 'bzrlib.tests.per_tree.test_walkdirs',
- ])
+ per_tree_mod_names = [
+ 'annotate_iter',
+ 'get_file_mtime',
+ 'get_file_with_stat',
+ 'get_root_id',
+ 'get_symlink_target',
+ 'inv',
+ 'iter_search_rules',
+ 'list_files',
+ 'path_content_summary',
+ 'revision_tree',
+ 'test_trees',
+ 'tree',
+ 'walkdirs',
+ ]
+ submod_tests = loader.loadTestsFromModuleNames(
+ ['bzrlib.tests.per_tree.test_' + name
+ for name in per_tree_mod_names])
scenarios = make_scenarios(
tests.default_transport,
# None here will cause a readonly decorator to be created
=== modified file 'bzrlib/tests/per_workingtree/__init__.py'
--- a/bzrlib/tests/per_workingtree/__init__.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/__init__.py 2009-07-10 10:46:00 +0000
@@ -60,45 +60,45 @@
def load_tests(standard_tests, module, loader):
- per_test_workingtree = [
- 'bzrlib.tests.per_workingtree.test_add_reference',
- 'bzrlib.tests.per_workingtree.test_add',
- 'bzrlib.tests.per_workingtree.test_annotate_iter',
- 'bzrlib.tests.per_workingtree.test_basis_inventory',
- 'bzrlib.tests.per_workingtree.test_basis_tree',
- 'bzrlib.tests.per_workingtree.test_break_lock',
- 'bzrlib.tests.per_workingtree.test_changes_from',
- 'bzrlib.tests.per_workingtree.test_content_filters',
- 'bzrlib.tests.per_workingtree.test_commit',
- 'bzrlib.tests.per_workingtree.test_eol_conversion',
- 'bzrlib.tests.per_workingtree.test_executable',
- 'bzrlib.tests.per_workingtree.test_flush',
- 'bzrlib.tests.per_workingtree.test_get_file_mtime',
- 'bzrlib.tests.per_workingtree.test_get_parent_ids',
- 'bzrlib.tests.per_workingtree.test_inv',
- 'bzrlib.tests.per_workingtree.test_is_control_filename',
- 'bzrlib.tests.per_workingtree.test_is_ignored',
- 'bzrlib.tests.per_workingtree.test_locking',
- 'bzrlib.tests.per_workingtree.test_merge_from_branch',
- 'bzrlib.tests.per_workingtree.test_mkdir',
- 'bzrlib.tests.per_workingtree.test_move',
- 'bzrlib.tests.per_workingtree.test_nested_specifics',
- 'bzrlib.tests.per_workingtree.test_parents',
- 'bzrlib.tests.per_workingtree.test_paths2ids',
- 'bzrlib.tests.per_workingtree.test_pull',
- 'bzrlib.tests.per_workingtree.test_put_file',
- 'bzrlib.tests.per_workingtree.test_readonly',
- 'bzrlib.tests.per_workingtree.test_read_working_inventory',
- 'bzrlib.tests.per_workingtree.test_remove',
- 'bzrlib.tests.per_workingtree.test_rename_one',
- 'bzrlib.tests.per_workingtree.test_revision_tree',
- 'bzrlib.tests.per_workingtree.test_set_root_id',
- 'bzrlib.tests.per_workingtree.test_smart_add',
- 'bzrlib.tests.per_workingtree.test_uncommit',
- 'bzrlib.tests.per_workingtree.test_unversion',
- 'bzrlib.tests.per_workingtree.test_views',
- 'bzrlib.tests.per_workingtree.test_walkdirs',
- 'bzrlib.tests.per_workingtree.test_workingtree',
+ per_wt_mod_names = [
+ 'add_reference',
+ 'add',
+ 'annotate_iter',
+ 'basis_inventory',
+ 'basis_tree',
+ 'break_lock',
+ 'changes_from',
+ 'content_filters',
+ 'commit',
+ 'eol_conversion',
+ 'executable',
+ 'flush',
+ 'get_file_mtime',
+ 'get_parent_ids',
+ 'inv',
+ 'is_control_filename',
+ 'is_ignored',
+ 'locking',
+ 'merge_from_branch',
+ 'mkdir',
+ 'move',
+ 'nested_specifics',
+ 'parents',
+ 'paths2ids',
+ 'pull',
+ 'put_file',
+ 'readonly',
+ 'read_working_inventory',
+ 'remove',
+ 'rename_one',
+ 'revision_tree',
+ 'set_root_id',
+ 'smart_add',
+ 'uncommit',
+ 'unversion',
+ 'views',
+ 'walkdirs',
+ 'workingtree',
]
scenarios = make_scenarios(
@@ -111,5 +111,7 @@
# add the tests for the sub modules
return tests.multiply_tests(
- loader.loadTestsFromModuleNames(per_test_workingtree),
+ loader.loadTestsFromModuleNames(
+ ['bzrlib.tests.per_workingtree.test_' + name
+ for name in per_wt_mod_names]),
scenarios, standard_tests)
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/test_selftest.py 2009-07-10 10:46:00 +0000
@@ -120,8 +120,7 @@
def get_test_permutations(self):
return sample_permutation
sample_permutation = [(1,2), (3,4)]
- from bzrlib.tests.per_transport \
- import get_transport_test_permutations
+ from bzrlib.tests.per_transport import get_transport_test_permutations
self.assertEqual(sample_permutation,
get_transport_test_permutations(MockModule()))
@@ -130,8 +129,7 @@
# as there are in all the registered transport modules - we assume if
# this matches its probably doing the right thing especially in
# combination with the tests for setting the right classes below.
- from bzrlib.tests.per_transport \
- import transport_test_permutations
+ from bzrlib.tests.per_transport import transport_test_permutations
from bzrlib.transport import _get_transport_modules
modules = _get_transport_modules()
permutation_count = 0
@@ -149,8 +147,7 @@
# This test used to know about all the possible transports and the
# order they were returned but that seems overly brittle (mbp
# 20060307)
- from bzrlib.tests.per_transport \
- import transport_test_permutations
+ from bzrlib.tests.per_transport import transport_test_permutations
scenarios = transport_test_permutations()
# there are at least that many builtin transports
self.assertTrue(len(scenarios) > 6)
@@ -293,8 +290,7 @@
def test_scenarios(self):
# check that constructor parameters are passed through to the adapted
# test.
- from bzrlib.tests.per_interrepository import \
- make_scenarios
+ from bzrlib.tests.per_interrepository import make_scenarios
server1 = "a"
server2 = "b"
formats = [(str, "C1", "C2"), (int, "D1", "D2")]
@@ -320,8 +316,7 @@
def test_scenarios(self):
# check that constructor parameters are passed through to the adapted
# test.
- from bzrlib.tests.per_workingtree \
- import make_scenarios
+ from bzrlib.tests.per_workingtree import make_scenarios
server1 = "a"
server2 = "b"
formats = [workingtree.WorkingTreeFormat2(),
@@ -2203,10 +2198,9 @@
test_list = [
# testmod_names
'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
+ ('bzrlib.tests.per_transport.TransportTests'
+ '.test_abspath(LocalURLServer)'),
'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
- # transport implementations
- ('bzrlib.tests.per_transport.TransportTests'
- '.test_abspath(LocalURLServer)'),
# modules_to_doctest
'bzrlib.timestamp.format_highres_date',
# plugins can't be tested that way since selftest may be run with
More information about the bazaar-commits
mailing list