luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 21:03:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tap' into 'master'

Browse Source 
gio: use TAPTestRunner in the memory monitor tests

See merge request GNOME/glib!1443
This commit is contained in:
Philip Withnall 2020-04-09 14:33:09 +00:00
commit fa76bde252
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,8 @@ import fcntl
import os import os
import time import time
import taptestrunner
from gi.repository import GLib from gi.repository import GLib
from gi.repository import Gio from gi.repository import Gio
@ -98,5 +100,4 @@ class TestLowMemoryMonitor(dbusmock.DBusTestCase):
if __name__ == '__main__': if __name__ == '__main__':
# avoid writing to stderr unittest.main(testRunner=taptestrunner.TAPTestRunner())
unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))

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

@ -21,6 +21,8 @@ import fcntl
import os import os
import time import time
import taptestrunner
from gi.repository import GLib from gi.repository import GLib
from gi.repository import Gio from gi.repository import Gio
@ -114,5 +116,4 @@ class TestLowMemoryMonitorPortal(dbusmock.DBusTestCase):
if __name__ == '__main__': if __name__ == '__main__':
# avoid writing to stderr unittest.main(testRunner=taptestrunner.TAPTestRunner())
unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))

3
gio/tests/meson.build
View File

@ -531,8 +531,9 @@ if installed_tests_enabled
cdata = configuration_data() cdata = configuration_data()
cdata.set('installed_tests_dir', installed_tests_execdir) cdata.set('installed_tests_dir', installed_tests_execdir)
cdata.set('program', memory_monitor_test + '.py') cdata.set('program', memory_monitor_test + '.py')
cdata.set('env', '')
configure_file( configure_file(
input: installed_tests_template, input: installed_tests_template_tap,
output: memory_monitor_test + '.test', output: memory_monitor_test + '.test',
install_dir: installed_tests_metadir, install_dir: installed_tests_metadir,
configuration: cdata configuration: cdata