Author: jure
Date: Tue Mar 5 12:51:33 2013
New Revision: 1452776
URL: http://svn.apache.org/r1452776
Log:
#355, ignore sub package root on test discovert, patch
t355_r1450181_trac_test_ignore_subpkg_root.diff applied (from Olemis)
Modified:
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/__init__.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/versioncontrol/api.py
Modified:
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/__init__.py
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/__init__.py?rev=1452776&r1=1452775&r2=1452776&view=diff
==============================================================================
---
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/__init__.py
(original)
+++
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/__init__.py
Tue Mar 5 12:51:33 2013
@@ -33,7 +33,7 @@ class TestLoader(unittest.TestLoader):
sortTestMethodsUsing = cmp
suiteClass = unittest.TestSuite
- def discover_package(self, package_or_requirement, pattern='test*.py'):
+ def discover_package(self, package_or_requirement, pattern='test*.py',
ignore_subpkg_root=True):
"""Find and return all test modules from the specified package
directory, recursing into subdirectories to find them. Only test files
that match the pattern will be loaded. (Using shell style pattern
@@ -56,10 +56,11 @@ class TestLoader(unittest.TestLoader):
# Skip packages not having __init__.py
continue
loader = getattr(mdl, self.testLoaderAttribute, None) or loader
- if mdlnm != package_or_requirement and hasattr(mdl, 'test_suite'):
- tests.append(mdl.test_suite())
- else:
- tests.append(loader.loadTestsFromModule(mdl))
+ if not (isdir and ignore_subpkg_root):
+ if mdlnm != package_or_requirement and hasattr(mdl,
'test_suite'):
+ tests.append(mdl.test_suite())
+ else:
+ tests.append(loader.loadTestsFromModule(mdl))
if isdir and resource_exists(mdlnm, '__init__.py'):
for fnm in resource_listdir(mdlnm, ''):
if resource_isdir(mdlnm, fnm):
Modified:
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/versioncontrol/api.py
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/versioncontrol/api.py?rev=1452776&r1=1452775&r2=1452776&view=diff
==============================================================================
---
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/versioncontrol/api.py
(original)
+++
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/tests/versioncontrol/api.py
Tue Mar 5 12:51:33 2013
@@ -54,42 +54,42 @@ class ProductResourceManagerTestCase(Res
def test_resource_changeset(self):
res = Resource('changeset', '42')
self.assertEqual('Changeset 42', get_resource_description(self.env,
res))
- self.assertEqual('/trac.cgi/product/tp1/changeset/42',
+ self.assertEqual('/trac.cgi/products/tp1/changeset/42',
get_resource_url(self.env, res, self.env.href))
repo = Resource('repository', 'repo')
res = Resource('changeset', '42', parent=repo)
self.assertEqual('Changeset 42 in repo',
get_resource_description(self.env, res))
- self.assertEqual('/trac.cgi/product/tp1/changeset/42/repo',
+ self.assertEqual('/trac.cgi/products/tp1/changeset/42/repo',
get_resource_url(self.env, res, self.env.href))
def test_resource_source(self):
res = Resource('source', '/trunk/src')
self.assertEqual('path /trunk/src',
get_resource_description(self.env, res))
- self.assertEqual('/trac.cgi/product/tp1/browser/trunk/src',
+ self.assertEqual('/trac.cgi/products/tp1/browser/trunk/src',
get_resource_url(self.env, res, self.env.href))
repo = Resource('repository', 'repo')
res = Resource('source', '/trunk/src', parent=repo)
self.assertEqual('path /trunk/src in repo',
get_resource_description(self.env, res))
- self.assertEqual('/trac.cgi/product/tp1/browser/repo/trunk/src',
+ self.assertEqual('/trac.cgi/products/tp1/browser/repo/trunk/src',
get_resource_url(self.env, res, self.env.href))
repo = Resource('repository', 'repo')
res = Resource('source', '/trunk/src', version=42, parent=repo)
self.assertEqual('path /trunk/src@42 in repo',
get_resource_description(self.env, res))
- self.assertEqual('/trac.cgi/product/tp1/browser/repo/trunk/src?rev=42',
+
self.assertEqual('/trac.cgi/products/tp1/browser/repo/trunk/src?rev=42',
get_resource_url(self.env, res, self.env.href))
def test_resource_repository(self):
res = Resource('repository', 'testrepo')
self.assertEqual('Repository testrepo',
get_resource_description(self.env, res))
- self.assertEqual('/trac.cgi/product/tp1/browser/testrepo',
+ self.assertEqual('/trac.cgi/products/tp1/browser/testrepo',
get_resource_url(self.env, res, self.env.href))
