From 759231ca53af3d060b93a8a7c66714bcf17fbc5b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Jun 2016 23:13:06 +0530 Subject: [PATCH] Merge selectors tests into css module --- setup/test.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup/test.py b/setup/test.py index 47bf57c297..6bedc21a21 100644 --- a/setup/test.py +++ b/setup/test.py @@ -8,7 +8,7 @@ import unittest from setup import Command -TEST_MODULES = frozenset('srv db polish selectors opf css docx cfi matcher icu smartypants'.split()) +TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants'.split()) def find_tests(which_tests=None): ans = [] @@ -22,9 +22,6 @@ def find_tests(which_tests=None): if not which_tests or 'polish' in which_tests: from calibre.ebooks.oeb.polish.tests.main import find_tests a(find_tests()) - if not which_tests or 'selectors' in which_tests: - from css_selectors.tests import find_tests - a(find_tests()) if not which_tests or 'opf' in which_tests: from calibre.ebooks.metadata.opf2 import suite a(suite()) @@ -37,6 +34,8 @@ def find_tests(which_tests=None): a(test_normalization(return_tests=True)) from calibre.ebooks.css_transform_rules import test a(test(return_tests=True)) + from css_selectors.tests import find_tests + a(find_tests()) if not which_tests or 'docx' in which_tests: from calibre.ebooks.docx.fields import test_parse_fields a(test_parse_fields(return_tests=True))