test_cpv: fix test_main and mark so nosetests will ignore it

diff --git a/pym/gentoolkit/test/test_cpv.py b/pym/gentoolkit/test/test_cpv.py
index 374940449f95b8267a6ee775fb5c6b5759db8f3a..b4de959f7d91a279d057a634335886f7336a0ffc 100644 (file)
--- a/pym/gentoolkit/test/test_cpv.py
+++ b/pym/gentoolkit/test/test_cpv.py
@@ -7,10 +7,6 @@
 # $Header$
 
 import unittest
-try:
-       from test import test_support
-except ImportError:
-       from test import support as test_support
 
 from gentoolkit.cpv import *
 from gentoolkit.test import cmp
@@ -136,7 +132,10 @@ class TestGentoolkitCPV(unittest.TestCase):
 
 
 def test_main():
-       test_support.run_unittest(TestGentoolkitCPV)
+       suite = unittest.TestLoader().loadTestsFromTestCase(TestGentoolkitCPV)
+       unittest.TextTestRunner(verbosity=2).run(suite)
+test_main.__test__ = False
+
 
 if __name__ == '__main__':
        test_main()