Merge branch 'wip/seb128/skip-memory-tests-if-portal-missing' into 'master'

tests: Skip GMemoryMonitor tests if xdg-desktop-portal is not available

See merge request GNOME/glib!1338
This commit is contained in:
Philip Withnall 2020-01-22 08:52:20 +00:00
commit ba4e5672ea

View File

@ -51,7 +51,11 @@ class TestLowMemoryMonitorPortal(dbusmock.DBusTestCase):
fcntl.fcntl(self.p_mock.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK)
self.last_warning = -1
self.dbusmock = dbus.Interface(self.obj_lmm, dbusmock.MOCK_IFACE)
self.xdp = subprocess.Popen([XDG_DESKTOP_PORTAL_PATH])
try:
self.xdp = subprocess.Popen([XDG_DESKTOP_PORTAL_PATH])
except FileNotFoundError:
raise unittest.SkipTest("xdg-desktop-portal not available")
try:
self.wait_for_bus_object('org.freedesktop.portal.Desktop',
'/org/freedesktop/portal/desktop')