From f338e67b0ab39e889e1e46dc9e1a73d7964f75fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 17 May 2021 18:42:59 +0100 Subject: [PATCH] Skip debian tests on non-debian systems. --- ognibuild/tests/__init__.py | 4 +++- ognibuild/tests/test_debian_fix_build.py | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ognibuild/tests/__init__.py b/ognibuild/tests/__init__.py index 42d25c4..075535d 100644 --- a/ognibuild/tests/__init__.py +++ b/ognibuild/tests/__init__.py @@ -17,14 +17,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. +import os import unittest def test_suite(): names = [ "debian_build", - "debian_fix_build", ] + if os.path.exists("/usr/bin/dpkg-architecture"): + names.append("debian_fix_build") module_names = ["ognibuild.tests.test_" + name for name in names] loader = unittest.TestLoader() return loader.loadTestsFromNames(module_names) diff --git a/ognibuild/tests/test_debian_fix_build.py b/ognibuild/tests/test_debian_fix_build.py index e3288b5..67151e4 100644 --- a/ognibuild/tests/test_debian_fix_build.py +++ b/ognibuild/tests/test_debian_fix_build.py @@ -65,8 +65,6 @@ class DummyAptSearcher(FileSearcher): class ResolveErrorTests(TestCaseWithTransport): def setUp(self): super(ResolveErrorTests, self).setUp() - if not os.path.exists("/usr/bin/dpkg-architecture"): - self.skipTest("not a debian system") self.tree = self.make_branch_and_tree(".") self.build_tree_contents( [