From 0ada6d0b64b0396718bc93f67b7808c45a06df30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 7 Apr 2017 12:29:32 +0200 Subject: [PATCH] tests: disable GTK tests on travis The environment there is way too old. QubesOS/qubes-issues#910 --- qubes/tests/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py index e2477709..e35a2f88 100644 --- a/qubes/tests/__init__.py +++ b/qubes/tests/__init__.py @@ -910,11 +910,17 @@ def load_tests(loader, tests, pattern): # pylint: disable=unused-argument 'qubes.tests.tools.qvm_firewall', 'qubes.tests.tools.qvm_ls', 'qubespolicy.tests', - 'qubespolicy.tests.gtkhelpers', - 'qubespolicy.tests.rpcconfirmation', ): tests.addTests(loader.loadTestsFromName(modname)) + # GTK/Glib is way too old there + if 'TRAVIS' not in os.environ: + for modname in ( + 'qubespolicy.tests.gtkhelpers', + 'qubespolicy.tests.rpcconfirmation', + ): + tests.addTests(loader.loadTestsFromName(modname)) + tests.addTests(loader.discover( os.path.join(os.path.dirname(__file__), 'tools')))