From 31706fd222edc7e75cb051012dab644e88537ea9 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Tue, 14 Aug 2018 09:09:13 -0400 Subject: Fix broken test suite The test suite (python setup.py test) was depending on a broken interface from dev-python/snakeoil. This indicates that tests weren't run in a while. We don't actually need snakeoil to run tests. Replaced the test command with a plain distutils Command. Moreover, one of test Query tests wasn't in sync with the code. Changed it to reflect current code. --- setup.py | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7d170e2..031afd3 100755 --- a/setup.py +++ b/setup.py @@ -5,8 +5,9 @@ from __future__ import print_function import re import sys -import distutils -from distutils import core #, log +import subprocess +from distutils import core +from distutils.cmd import Command from glob import glob import os @@ -98,26 +99,19 @@ class set_version(core.Command): sub(manpages, man_re) -def load_test(): - """Only return the real test class if it's actually being run so that we - don't depend on snakeoil just to install.""" +class TestCommand(Command): + user_options = [] - desc = "run the test suite" - if 'test' in sys.argv[1:]: - try: - from snakeoil import distutils_extensions - except ImportError: - sys.stderr.write("Error: We depend on dev-python/snakeoil ") - sys.stderr.write("to run tests.\n") - sys.exit(1) - class test(distutils_extensions.test): - description = desc - default_test_namespace = 'gentoolkit.test' - else: - class test(core.Command): - description = desc + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + args = [sys.executable, '-m', 'unittest', 'discover', 'pym'] + raise SystemExit(subprocess.call(args)) - return test packages = [ str('.'.join(root.split(os.sep)[1:])) @@ -156,7 +150,7 @@ core.setup( (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/lib/tmpfiles.d'), ['data/tmpfiles.d/revdep-rebuild.conf']), ), cmdclass={ - 'test': load_test(), + 'test': TestCommand, 'set_version': set_version, }, ) -- cgit v1.2.3