tests/__init__: return int from main()

diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py
index fedb7e605a4ab52da9456f74b58e7828c2daeb3d..492ece44bfbb6398eca5cd5c5d5c1dd740b4fcc8 100644 (file)
--- a/pym/portage/tests/__init__.py
+++ b/pym/portage/tests/__init__.py
@@ -34,15 +34,18 @@ def main():
                        testsubdir = os.path.basename(mydir)
                        for name in getTestNames(mydir):
                                print("%s/%s/%s.py" % (testdir, testsubdir, name))
-               sys.exit(0)
+               return os.EX_OK
 
        if len(args) > 1:
                suite.addTests(getTestFromCommandLine(args[1:], basedir))
-               return TextTestRunner(verbosity=2).run(suite)
+       else:
+               for mydir in getTestDirs(basedir):
+                       suite.addTests(getTests(os.path.join(basedir, mydir), basedir))
 
-       for mydir in getTestDirs(basedir):
-               suite.addTests(getTests(os.path.join(basedir, mydir), basedir) )
-       return TextTestRunner(verbosity=2).run(suite)
+       result = TextTestRunner(verbosity=2).run(suite)
+       if not result.wasSuccessful():
+               return 1
+       return os.EX_OK
 
 def my_import(name):
        mod = __import__(name)

diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
index 146f7d4acac8cc81c02d9176a1a766dffe484d35..4c10087084183233959772fbb618261362d51104 100755 (executable)
--- a/pym/portage/tests/runTests
+++ b/pym/portage/tests/runTests
@@ -41,6 +41,4 @@ del path
 
 
 if __name__ == "__main__":
-       result = tests.main()
-       if not result.wasSuccessful():
-               sys.exit(1)
+       sys.exit(tests.main())