summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2007-01-11 05:09:38 +0000
committerAlec Warner <antarus@gentoo.org>2007-01-11 05:09:38 +0000
commit44a5c71bb162790b8a1a4e37a13cfc0574ac489b (patch)
tree414a816e953eb9ac0c9f35aaaf91ad704f96f4d0
parent204e04984f4f238e8991e025d50e95e69aed08f9 (diff)
downloadportage-44a5c71bb162790b8a1a4e37a13cfc0574ac489b.tar.gz
portage-44a5c71bb162790b8a1a4e37a13cfc0574ac489b.tar.bz2
portage-44a5c71bb162790b8a1a4e37a13cfc0574ac489b.zip
Add a bit of path mangling to allow deeper tests
svn path=/main/trunk/; revision=5537
-rw-r--r--tests/__init__.py9
-rw-r--r--tests/portage_versions/__init__.py4
-rw-r--r--tests/portage_versions/test_vercmp.py (renamed from tests/portage/test_vercmp.py)0
3 files changed, 9 insertions, 4 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index 2808ed5a4..58ba3d41c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,13 +7,13 @@ import os, unittest
def main():
- testDirs = ["portage", "portage_util"]
+ testDirs = ["portage", "portage_util", "test/foo"]
suite = unittest.TestSuite()
basedir = os.path.dirname(__file__)
for mydir in testDirs:
- suite.addTests(getTests(os.path.join(basedir, mydir)))
+ suite.addTests(getTests(os.path.join(basedir, mydir), basedir) )
return unittest.TextTestRunner(verbosity=2).run(suite)
@@ -24,7 +24,7 @@ def my_import(name):
mod = getattr(mod, comp)
return mod
-def getTests( path ):
+def getTests( path, base_path ):
"""
path is the path to a given subdir ( 'portage/' for example)
@@ -35,7 +35,8 @@ def getTests( path ):
import os
files = os.listdir( path )
files = [ f[:-3] for f in files if f.startswith("test_") and f.endswith(".py") ]
- parent_module = ".".join(("tests", os.path.basename(path)))
+ parent_path = path[len(base_path):]
+ parent_module = ".".join(("tests", parent_path))
result = []
for mymodule in files:
try:
diff --git a/tests/portage_versions/__init__.py b/tests/portage_versions/__init__.py
new file mode 100644
index 000000000..e1c0ae595
--- /dev/null
+++ b/tests/portage_versions/__init__.py
@@ -0,0 +1,4 @@
+# tests/portage/__init__.py -- Portage Unit Test functionality
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: __init__.py 5522 2007-01-10 12:30:05Z antarus $
diff --git a/tests/portage/test_vercmp.py b/tests/portage_versions/test_vercmp.py
index 117472e49..117472e49 100644
--- a/tests/portage/test_vercmp.py
+++ b/tests/portage_versions/test_vercmp.py