luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 16:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/hadess/fix-assert-eventually' into 'main'

Browse Source 
gio: Fix conditions in memory-monitor test

See merge request GNOME/glib!2240
This commit is contained in:
Philip Withnall 2021-09-06 13:07:19 +00:00
commit 5b90f9d088
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/memory-monitor-dbus.py.in
View File

@ -99,11 +99,11 @@ try:
self.dbusmock.EmitWarning(100) self.dbusmock.EmitWarning(100)
# Wait 2 seconds or until warning # Wait 2 seconds or until warning
self.assertEventually(self.last_warning == 100, "'100' low-memory warning not received", 20) self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20)
self.dbusmock.EmitWarning(255) self.dbusmock.EmitWarning(255)
# Wait 2 seconds or until warning # Wait 2 seconds or until warning
self.assertEventually(self.last_warning == 255, "'255' low-memory warning not received", 20) self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20)
except ImportError as e: except ImportError as e:
@unittest.skip("Cannot import %s" % e.name) @unittest.skip("Cannot import %s" % e.name)

4
gio/tests/memory-monitor-portal.py.in
View File

@ -117,11 +117,11 @@ try:
self.dbusmock.EmitWarning(100) self.dbusmock.EmitWarning(100)
# Wait 2 seconds or until warning # Wait 2 seconds or until warning
self.assertEventually(self.last_warning == 100, "'100' low-memory warning not received", 20) self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20)
self.dbusmock.EmitWarning(255) self.dbusmock.EmitWarning(255)
# Wait 2 seconds or until warning # Wait 2 seconds or until warning
self.assertEventually(self.last_warning == 255, "'255' low-memory warning not received", 20) self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20)
except ImportError as e: except ImportError as e:
@unittest.skip("Cannot import %s" % e.name) @unittest.skip("Cannot import %s" % e.name)