[gentoo-commits] proj/pms-test-suite:master commit in: /

["Michał Górny" <mgorny@gentoo.org>]

commit:     9f87f959c266cb079b16094d3ab10a23137178ee
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 12:44:20 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 12:44:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=9f87f959

Run tests using 'setup.py test'.

---
 run-tests.py |   23 -----------------------
 setup.py     |   40 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/run-tests.py b/run-tests.py
deleted file mode 100755
index 956e744..0000000
--- a/run-tests.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-
-import unittest, doctest
-
-import PMSTestSuite.cli
-import PMSTestSuite.library
-import PMSTestSuite.pm
-import PMSTestSuite.pm.pkgcorepm
-import PMSTestSuite.pm.portagepm
-import PMSTestSuite.repository
-
-def load_tests(loader, tests, ignore):
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.cli))
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.library))
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.library.case))
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.pm))
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.pm.pkgcorepm))
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.pm.portagepm))
-	tests.addTests(doctest.DocTestSuite(PMSTestSuite.repository))
-	return tests
-
-if __name__ == '__main__':
-	unittest.main()

diff --git a/setup.py b/setup.py
index af06fec..271d13f 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
-from distutils.core import setup
+from distutils.core import setup, Command
 
 import os.path, sys
 
@@ -13,6 +13,38 @@ try:
 except ImportError:
 	PV = 'unknown'
 
+class TestCommand(Command):
+	user_options = []
+
+	def initialize_options(self):
+		pass
+
+	def finalize_options(self):
+		pass
+
+	def run(self):
+		import unittest, doctest
+
+		import PMSTestSuite.cli
+		import PMSTestSuite.library
+		import PMSTestSuite.pm
+		import PMSTestSuite.pm.pkgcorepm
+		import PMSTestSuite.pm.portagepm
+		import PMSTestSuite.repository
+
+		tests = unittest.TestSuite()
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.cli))
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.library))
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.library.case))
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.pm))
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.pm.pkgcorepm))
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.pm.portagepm))
+		tests.addTests(doctest.DocTestSuite(PMSTestSuite.repository))
+
+		r = unittest.TextTestRunner()
+		res = r.run(tests)
+		sys.exit(0 if res.wasSuccessful() else 1)
+
 setup(
 		name = 'pms-test-suite',
 		version = PV,
@@ -43,5 +75,9 @@ setup(
 			'Topic :: Software Development :: Quality Assurance',
 			'Topic :: Software Development :: Testing',
 			'Topic :: System :: Installation/Setup'
-		]
+		],
+
+		cmdclass = {
+			'test': TestCommand
+		}
 )