From 4761866fa301e6726333d08152d408df3e3f2e01 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 27 Jun 2021 17:50:03 -0400 Subject: [PATCH] tests: fix exclusion of FreeBSD code calibre.devices.usbms.hal was added as a FreeBSD backend, but the test exclusion only tries importing it on Linux. It does import on Linux, but what we actually care about is that it imports on FreeBSD. --- setup/test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup/test.py b/setup/test.py index 1022b73066..5225042e61 100644 --- a/setup/test.py +++ b/setup/test.py @@ -8,7 +8,7 @@ import subprocess import sys import unittest -from setup import SRC, Command, islinux, ismacos, iswindows +from setup import SRC, Command, isbsd, islinux, ismacos, iswindows TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc dbcli ebooks'.split()) @@ -50,8 +50,10 @@ class TestImports(unittest.TestCase): exclude_modules |= { 'calibre.linux', 'calibre.utils.linux_trash', 'calibre.utils.open_with.linux', - 'calibre.gui2.linux_file_dialogs', 'calibre.devices.usbms.hal', + 'calibre.gui2.linux_file_dialogs', } + if not isbsd: + exclude_modules.add('calibre.devices.usbms.hal') self.assertGreater(self.base_check(os.path.join(SRC, 'odf'), exclude_packages, exclude_modules), 10) base = os.path.join(SRC, 'calibre') self.assertGreater(self.base_check(base, exclude_packages, exclude_modules), 1000)