From 7c1c3f62d1a4b91f8ef97f66ba24fce5b70e3dce Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 11 Oct 2018 17:05:55 +0100 Subject: [PATCH] [Tests] Ensure GTKUI tests are skipped upon import errors Need to catch any issues with importing GTK modules to ensure GTKUI tests are skipped in non-GTK environments. --- deluge/tests/test_torrentview.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/deluge/tests/test_torrentview.py b/deluge/tests/test_torrentview.py index 8754a4fda..6c4350a48 100644 --- a/deluge/tests/test_torrentview.py +++ b/deluge/tests/test_torrentview.py @@ -22,18 +22,19 @@ from .basetest import BaseTestCase # Allow running other tests without GTKUI dependencies available try: - from gi.repository.GObject import TYPE_UINT64 -except ImportError: - libs_available = False - TYPE_UINT64 = 'Whatever' -else: - libs_available = True # pylint: disable=ungrouped-imports + from gi.repository.GObject import TYPE_UINT64 + from deluge.ui.gtk3.gtkui import DEFAULT_PREFS from deluge.ui.gtk3.mainwindow import MainWindow from deluge.ui.gtk3.menubar import MenuBar from deluge.ui.gtk3.torrentdetails import TorrentDetails from deluge.ui.gtk3.torrentview import TorrentView +except (ImportError, ValueError): + libs_available = False + TYPE_UINT64 = 'Whatever' +else: + libs_available = True setup_translations()