mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-15 14:57:15 +01:00
Merge branch 'backport-1448-dbus-tests-glib-2-64' into 'glib-2-64'
Backport !1448 memory monitor test dependency fixes to glib-2-64 See merge request GNOME/glib!1471
This commit is contained in:
Emmanuele Bassi
commit
46756977a1
@ -14,89 +14,98 @@ __license__ = 'LGPL 3+'
|
||||
import unittest
|
||||
import sys
|
||||
import subprocess
|
||||
import dbus
|
||||
import dbus.mainloop.glib
|
||||
import dbusmock
|
||||
import fcntl
|
||||
import os
|
||||
import time
|
||||
|
||||
from gi.repository import GLib
|
||||
from gi.repository import Gio
|
||||
import taptestrunner
|
||||
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
|
||||
try:
|
||||
# Do all non-standard imports here so we can skip the tests if any
|
||||
# needed packages are not available.
|
||||
import dbus
|
||||
import dbus.mainloop.glib
|
||||
import dbusmock
|
||||
from gi.repository import GLib
|
||||
from gi.repository import Gio
|
||||
|
||||
# XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal")
|
||||
XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal"
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
|
||||
|
||||
class TestLowMemoryMonitor(dbusmock.DBusTestCase):
|
||||
'''Test GMemoryMonitorDBus'''
|
||||
# XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal")
|
||||
XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal"
|
||||
|
||||
@classmethod
|
||||
def setUpClass(klass):
|
||||
klass.start_system_bus()
|
||||
klass.dbus_con = klass.get_dbus(True)
|
||||
class TestLowMemoryMonitor(dbusmock.DBusTestCase):
|
||||
'''Test GMemoryMonitorDBus'''
|
||||
|
||||
def setUp(self):
|
||||
try:
|
||||
Gio.MemoryMonitor
|
||||
except AttributeError:
|
||||
raise unittest.SkipTest('Low memory monitor not in '
|
||||
'introspection data. Requires '
|
||||
'GObject-Introspection ≥ 1.63.2')
|
||||
try:
|
||||
(self.p_mock, self.obj_lmm) = self.spawn_server_template(
|
||||
'low_memory_monitor', {}, stdout=subprocess.PIPE)
|
||||
except ModuleNotFoundError:
|
||||
raise unittest.SkipTest("Low memory monitor dbusmock template not "
|
||||
"found. Requires dbusmock ≥ 0.18.4.")
|
||||
# set log to nonblocking
|
||||
flags = fcntl.fcntl(self.p_mock.stdout, fcntl.F_GETFL)
|
||||
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.memory_monitor = Gio.MemoryMonitor.dup_default()
|
||||
self.memory_monitor.connect("low-memory-warning", self.memory_warning_cb)
|
||||
self.mainloop = GLib.MainLoop()
|
||||
self.main_context = self.mainloop.get_context()
|
||||
@classmethod
|
||||
def setUpClass(klass):
|
||||
klass.start_system_bus()
|
||||
klass.dbus_con = klass.get_dbus(True)
|
||||
|
||||
def tearDown(self):
|
||||
self.p_mock.terminate()
|
||||
self.p_mock.wait()
|
||||
def setUp(self):
|
||||
try:
|
||||
Gio.MemoryMonitor
|
||||
except AttributeError:
|
||||
raise unittest.SkipTest('Low memory monitor not in '
|
||||
'introspection data. Requires '
|
||||
'GObject-Introspection ≥ 1.63.2')
|
||||
try:
|
||||
(self.p_mock, self.obj_lmm) = self.spawn_server_template(
|
||||
'low_memory_monitor', {}, stdout=subprocess.PIPE)
|
||||
except ModuleNotFoundError:
|
||||
raise unittest.SkipTest("Low memory monitor dbusmock template not "
|
||||
"found. Requires dbusmock ≥ 0.18.4.")
|
||||
# set log to nonblocking
|
||||
flags = fcntl.fcntl(self.p_mock.stdout, fcntl.F_GETFL)
|
||||
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.memory_monitor = Gio.MemoryMonitor.dup_default()
|
||||
self.memory_monitor.connect("low-memory-warning", self.memory_warning_cb)
|
||||
self.mainloop = GLib.MainLoop()
|
||||
self.main_context = self.mainloop.get_context()
|
||||
|
||||
def memory_warning_cb(self, monitor, level):
|
||||
self.last_warning = level
|
||||
self.main_context.wakeup()
|
||||
def tearDown(self):
|
||||
self.p_mock.terminate()
|
||||
self.p_mock.wait()
|
||||
|
||||
def test_low_memory_warning_signal(self):
|
||||
'''LowMemoryWarning signal'''
|
||||
def memory_warning_cb(self, monitor, level):
|
||||
self.last_warning = level
|
||||
self.main_context.wakeup()
|
||||
|
||||
# Wait 2 seconds
|
||||
timeout = 2
|
||||
while timeout > 0:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
def test_low_memory_warning_signal(self):
|
||||
'''LowMemoryWarning signal'''
|
||||
|
||||
self.dbusmock.EmitWarning(100)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 100:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 100)
|
||||
# Wait 2 seconds
|
||||
timeout = 2
|
||||
while timeout > 0:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
|
||||
self.dbusmock.EmitWarning(255)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 255:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 255)
|
||||
self.dbusmock.EmitWarning(100)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 100:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 100)
|
||||
|
||||
self.dbusmock.EmitWarning(255)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 255:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 255)
|
||||
|
||||
except ImportError as e:
|
||||
@unittest.skip("Cannot import %s" % e.name)
|
||||
class TestLowMemoryMonitor(unittest.TestCase):
|
||||
def test_low_memory_warning_signal(self):
|
||||
pass
|
||||
|
||||
if __name__ == '__main__':
|
||||
# avoid writing to stderr
|
||||
unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))
|
||||
unittest.main(testRunner=taptestrunner.TAPTestRunner())
|
||||
|
||||
@ -14,105 +14,114 @@ __license__ = 'LGPL 3+'
|
||||
import unittest
|
||||
import sys
|
||||
import subprocess
|
||||
import dbus
|
||||
import dbus.mainloop.glib
|
||||
import dbusmock
|
||||
import fcntl
|
||||
import os
|
||||
import time
|
||||
|
||||
from gi.repository import GLib
|
||||
from gi.repository import Gio
|
||||
import taptestrunner
|
||||
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
|
||||
try:
|
||||
# Do all non-standard imports here so we can skip the tests if any
|
||||
# needed packages are not available.
|
||||
import dbus
|
||||
import dbus.mainloop.glib
|
||||
import dbusmock
|
||||
from gi.repository import GLib
|
||||
from gi.repository import Gio
|
||||
|
||||
# XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal")
|
||||
XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal"
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
|
||||
|
||||
class TestLowMemoryMonitorPortal(dbusmock.DBusTestCase):
|
||||
'''Test GMemoryMonitorPortal'''
|
||||
# XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal")
|
||||
XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal"
|
||||
|
||||
@classmethod
|
||||
def setUpClass(klass):
|
||||
klass.start_system_bus()
|
||||
klass.dbus_con = klass.get_dbus(True)
|
||||
# Start session bus so that xdg-desktop-portal can run on it
|
||||
klass.start_session_bus()
|
||||
class TestLowMemoryMonitorPortal(dbusmock.DBusTestCase):
|
||||
'''Test GMemoryMonitorPortal'''
|
||||
|
||||
def setUp(self):
|
||||
try:
|
||||
Gio.MemoryMonitor
|
||||
except AttributeError:
|
||||
raise unittest.SkipTest('Low memory monitor not in '
|
||||
'introspection data. Requires '
|
||||
'GObject-Introspection ≥ 1.63.2')
|
||||
try:
|
||||
(self.p_mock, self.obj_lmm) = self.spawn_server_template(
|
||||
'low_memory_monitor', {}, stdout=subprocess.PIPE)
|
||||
except ModuleNotFoundError:
|
||||
raise unittest.SkipTest("Low memory monitor dbusmock template not "
|
||||
"found. Requires dbusmock ≥ 0.18.4.")
|
||||
# set log to nonblocking
|
||||
flags = fcntl.fcntl(self.p_mock.stdout, fcntl.F_GETFL)
|
||||
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)
|
||||
try:
|
||||
self.xdp = subprocess.Popen([XDG_DESKTOP_PORTAL_PATH])
|
||||
except FileNotFoundError:
|
||||
raise unittest.SkipTest("xdg-desktop-portal not available")
|
||||
@classmethod
|
||||
def setUpClass(klass):
|
||||
klass.start_system_bus()
|
||||
klass.dbus_con = klass.get_dbus(True)
|
||||
# Start session bus so that xdg-desktop-portal can run on it
|
||||
klass.start_session_bus()
|
||||
|
||||
try:
|
||||
self.wait_for_bus_object('org.freedesktop.portal.Desktop',
|
||||
'/org/freedesktop/portal/desktop')
|
||||
except:
|
||||
raise
|
||||
# subprocess.Popen(['gdbus', 'monitor', '--session', '--dest', 'org.freedesktop.portal.Desktop'])
|
||||
def setUp(self):
|
||||
try:
|
||||
Gio.MemoryMonitor
|
||||
except AttributeError:
|
||||
raise unittest.SkipTest('Low memory monitor not in '
|
||||
'introspection data. Requires '
|
||||
'GObject-Introspection ≥ 1.63.2')
|
||||
try:
|
||||
(self.p_mock, self.obj_lmm) = self.spawn_server_template(
|
||||
'low_memory_monitor', {}, stdout=subprocess.PIPE)
|
||||
except ModuleNotFoundError:
|
||||
raise unittest.SkipTest("Low memory monitor dbusmock template not "
|
||||
"found. Requires dbusmock ≥ 0.18.4.")
|
||||
# set log to nonblocking
|
||||
flags = fcntl.fcntl(self.p_mock.stdout, fcntl.F_GETFL)
|
||||
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)
|
||||
try:
|
||||
self.xdp = subprocess.Popen([XDG_DESKTOP_PORTAL_PATH])
|
||||
except FileNotFoundError:
|
||||
raise unittest.SkipTest("xdg-desktop-portal not available")
|
||||
|
||||
os.environ['GTK_USE_PORTAL'] = "1"
|
||||
self.memory_monitor = Gio.MemoryMonitor.dup_default()
|
||||
assert("GMemoryMonitorPortal" in str(self.memory_monitor))
|
||||
self.memory_monitor.connect("low-memory-warning", self.portal_memory_warning_cb)
|
||||
self.mainloop = GLib.MainLoop()
|
||||
self.main_context = self.mainloop.get_context()
|
||||
try:
|
||||
self.wait_for_bus_object('org.freedesktop.portal.Desktop',
|
||||
'/org/freedesktop/portal/desktop')
|
||||
except:
|
||||
raise
|
||||
# subprocess.Popen(['gdbus', 'monitor', '--session', '--dest', 'org.freedesktop.portal.Desktop'])
|
||||
|
||||
def tearDown(self):
|
||||
self.p_mock.terminate()
|
||||
self.p_mock.wait()
|
||||
os.environ['GTK_USE_PORTAL'] = "1"
|
||||
self.memory_monitor = Gio.MemoryMonitor.dup_default()
|
||||
assert("GMemoryMonitorPortal" in str(self.memory_monitor))
|
||||
self.memory_monitor.connect("low-memory-warning", self.portal_memory_warning_cb)
|
||||
self.mainloop = GLib.MainLoop()
|
||||
self.main_context = self.mainloop.get_context()
|
||||
|
||||
def portal_memory_warning_cb(self, monitor, level):
|
||||
self.last_warning = level
|
||||
self.main_context.wakeup()
|
||||
def tearDown(self):
|
||||
self.p_mock.terminate()
|
||||
self.p_mock.wait()
|
||||
|
||||
def test_low_memory_warning_portal_signal(self):
|
||||
'''LowMemoryWarning signal'''
|
||||
def portal_memory_warning_cb(self, monitor, level):
|
||||
self.last_warning = level
|
||||
self.main_context.wakeup()
|
||||
|
||||
# Wait 2 seconds
|
||||
timeout = 2
|
||||
while timeout > 0:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
def test_low_memory_warning_portal_signal(self):
|
||||
'''LowMemoryWarning signal'''
|
||||
|
||||
self.dbusmock.EmitWarning(100)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 100:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 100)
|
||||
# Wait 2 seconds
|
||||
timeout = 2
|
||||
while timeout > 0:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
|
||||
self.dbusmock.EmitWarning(255)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 255:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 255)
|
||||
self.dbusmock.EmitWarning(100)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 100:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 100)
|
||||
|
||||
self.dbusmock.EmitWarning(255)
|
||||
# Wait 2 seconds or until warning
|
||||
timeout = 2
|
||||
while timeout > 0 and self.last_warning != 255:
|
||||
time.sleep(0.5)
|
||||
timeout -= 0.5
|
||||
self.main_context.iteration(False)
|
||||
self.assertEqual(self.last_warning, 255)
|
||||
|
||||
except ImportError as e:
|
||||
@unittest.skip("Cannot import %s" % e.name)
|
||||
class TestLowMemoryMonitorPortal(unittest.TestCase):
|
||||
def test_low_memory_warning_portal_signal(self):
|
||||
pass
|
||||
|
||||
if __name__ == '__main__':
|
||||
# avoid writing to stderr
|
||||
unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))
|
||||
unittest.main(testRunner=taptestrunner.TAPTestRunner())
|
||||
|
||||
@ -531,8 +531,9 @@ if installed_tests_enabled
|
||||
cdata = configuration_data()
|
||||
cdata.set('installed_tests_dir', installed_tests_execdir)
|
||||
cdata.set('program', memory_monitor_test + '.py')
|
||||
cdata.set('env', '')
|
||||
configure_file(
|
||||
input: installed_tests_template,
|
||||
input: installed_tests_template_tap,
|
||||
output: memory_monitor_test + '.test',
|
||||
install_dir: installed_tests_metadir,
|
||||
configuration: cdata
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user