From: Alec Warner Date: Fri, 7 Sep 2007 09:40:39 +0000 (-0000) Subject: Rewrite testing to use __test__ instead of hardcoded dirs X-Git-Tag: v2.2_pre1~828 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=40e34b8ce64628d6745179b65cbeadac85ca30e4;p=portage.git Rewrite testing to use __test__ instead of hardcoded dirs svn path=/main/trunk/; revision=7748 --- diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py index 2ade6d402..8380b6c31 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -9,10 +9,21 @@ import time import unittest def main(): - testDirs = ["bin", "dep", "ebuild", - "env/config", "util", "versions", "xpak", "sets/shell"] + + TEST_FILE = '__test__' suite = unittest.TestSuite() basedir = os.path.dirname(__file__) + testDirs = [] + + # the os.walk help mentions relative paths as being quirky + # I was tired of adding dirs to the list, so now we add __test__ + # to each dir we want tested. + for root, dirs, files in os.walk(os.getcwd()): + if ".svn" in dirs: + dirs.remove('.svn') + if TEST_FILE in files: + testDirs.append(root) + for mydir in testDirs: suite.addTests(getTests(os.path.join(basedir, mydir), basedir) ) return TextTestRunner(verbosity=2).run(suite) diff --git a/pym/portage/tests/bin/__test__ b/pym/portage/tests/bin/__test__ new file mode 100644 index 000000000..e69de29bb diff --git a/pym/portage/tests/dep/__test__ b/pym/portage/tests/dep/__test__ new file mode 100644 index 000000000..e69de29bb diff --git a/pym/portage/tests/env/__test__ b/pym/portage/tests/env/__test__ new file mode 100644 index 000000000..e69de29bb diff --git a/pym/portage/tests/env/config/__test__ b/pym/portage/tests/env/config/__test__ new file mode 100644 index 000000000..e69de29bb diff --git a/pym/portage/tests/util/__test__ b/pym/portage/tests/util/__test__ new file mode 100644 index 000000000..e69de29bb diff --git a/pym/portage/tests/versions/__test__ b/pym/portage/tests/versions/__test__ new file mode 100644 index 000000000..e69de29bb diff --git a/pym/portage/tests/xpak/__test__ b/pym/portage/tests/xpak/__test__ new file mode 100644 index 000000000..e69de29bb