Take Genone's suggestion and break the modules up into module oriented fashion. ...

svn path=/main/trunk/; revision=5525

diff --git a/tests/__init__.py b/tests/__init__.py
index a32ca05d322a021e8bc8803e8747399010f47800..71d699770d39cb07f17d34ffa86a92d80e4ead10 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,16 +7,34 @@ import unittest
 
 def main():
        
-       tests = ["test_atoms", "test_util"]
+       testDirs = ["portage/", "portage_util/"]
 
        suite = unittest.TestSuite()
 
-       for mod in tests:
+       for dir in testDirs:
+               suite.addTests(getTests(dir))
+
+       return unittest.TextTestRunner(verbosity=2).run(suite)
+
+def getTests( path ):
+       """
+
+       path is the path to a given subdir ( 'portage/' for example)
+       This does a simple filter on files in that dir to give us modules
+       to import
+
+       """
+       import os
+       files = os.listdir( path )
+       files = [ f[:-3] for f in files if f.startswith("test_") and f.endswith(".py") ]
+
+       result = []
+       for file in files:
                try:
-                       loadMod = __import__(mod)
-                       tmpSuite = unittest.TestLoader().loadTestsFromModule(loadMod)
-                       suite.addTest(tmpSuite)
+                       # Make the trailing / a . for module importing
+                       path2 = path[:-1] + "." + file
+                       mod = __import__( path2, globals(), locals(), [path[-1]])
+                       result.append( unittest.TestLoader().loadTestsFromModule(mod) )
                except ImportError:
                        pass
-
-       return unittest.TextTestRunner(verbosity=2).run(suite)
+       return result

diff --git a/tests/portage/__init__.py b/tests/portage/__init__.py
new file mode 100644 (file)
index 0000000..e1c0ae5
--- /dev/null
+++ b/tests/portage/__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/test_atoms.py b/tests/portage/test_atoms.py
similarity index 100%
rename from tests/test_atoms.py
rename to tests/portage/test_atoms.py

diff --git a/tests/portage_util/__init__.py b/tests/portage_util/__init__.py
new file mode 100644 (file)
index 0000000..ede012f
--- /dev/null
+++ b/tests/portage_util/__init__.py
@@ -0,0 +1,5 @@
+# tests/portage_util/__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/test_util.py b/tests/portage_util/test_util.py
similarity index 100%
rename from tests/test_util.py
rename to tests/portage_util/test_util.py