From 1ff4f01b395547e4713e54ca0e3498f38b805b61 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 5 Dec 2016 19:00:00 +0530 Subject: [PATCH] Use find_tests() for library.test_cli as well --- setup/test.py | 5 ++++- src/calibre/library/test_cli.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/setup/test.py b/setup/test.py index b7ac4dd1c5..760fd15b22 100644 --- a/setup/test.py +++ b/setup/test.py @@ -10,9 +10,11 @@ from setup import Command TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc library'.split()) + def find_tests(which_tests=None): ans = [] a = ans.append + def ok(x): return not which_tests or x in which_tests @@ -65,7 +67,8 @@ def find_tests(which_tests=None): from calibre.utils.shared_file import find_tests a(find_tests()) if ok('library'): - a(unittest.TestLoader().discover('src/calibre/library')) + from calibre.library.test_cli import find_tests + a(find_tests()) tests = unittest.TestSuite(ans) return tests diff --git a/src/calibre/library/test_cli.py b/src/calibre/library/test_cli.py index be7c55f179..40db50fd97 100644 --- a/src/calibre/library/test_cli.py +++ b/src/calibre/library/test_cli.py @@ -98,3 +98,7 @@ class PrintCheckLibraryResultsTest(unittest.TestCase): result = mock_stdout.getvalue().split('\n') parsed_result = [l for l in csv.reader(result) if l] self.assertEqual(parsed_result, [[self.check_human_name, data[0][0], data[0][1]]]) + + +def find_tests(): + return unittest.defaultTestLoader.loadTestsFromTestCase(PrintCheckLibraryResultsTest)