diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-11-06 14:24:14 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-01-27 14:29:59 +0000 |
commit | 04056bba4143f516fb58045fa48a733a0711f1c8 (patch) | |
tree | f607f71a110d321024bcc2430103597da27d9a3d /test | |
parent | 180f3a80617b7579b6fe3711661f343d4e8f44d4 (diff) | |
download | dbus-04056bba4143f516fb58045fa48a733a0711f1c8.tar.gz dbus-04056bba4143f516fb58045fa48a733a0711f1c8.tar.bz2 dbus-04056bba4143f516fb58045fa48a733a0711f1c8.zip |
Use pygi instead of pygobject 2
pygobject 2 is obsolete and unmaintained, and anyway this is for
optional functionality (full regression test coverage) rather than
anything that will be needed in production builds.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85969
Diffstat (limited to 'test')
-rw-r--r-- | test/name-test/test-activation-forking.py | 6 | ||||
-rwxr-xr-x | test/name-test/test-wait-for-echo.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/name-test/test-activation-forking.py b/test/name-test/test-activation-forking.py index 0d820754..f98537eb 100644 --- a/test/name-test/test-activation-forking.py +++ b/test/name-test/test-activation-forking.py @@ -3,7 +3,7 @@ import os,sys try: - import gobject + from gi.repository import GObject import dbus import dbus.mainloop.glib except: @@ -11,7 +11,7 @@ except: sys.exit(0) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -loop = gobject.MainLoop() +loop = GObject.MainLoop() exitcode = 0 @@ -54,7 +54,7 @@ def check_counter(): if counter == 0: print "Failed to get NameOwnerChanged for TestSuiteForkingEchoService" sys.exit(1) -gobject.timeout_add(15000, check_counter) +GObject.timeout_add(15000, check_counter) loop.run() sys.exit(0) diff --git a/test/name-test/test-wait-for-echo.py b/test/name-test/test-wait-for-echo.py index bd09e459..49ecbb46 100755 --- a/test/name-test/test-wait-for-echo.py +++ b/test/name-test/test-wait-for-echo.py @@ -3,15 +3,15 @@ import os,sys try: - import gobject import dbus import dbus.mainloop.glib + from gi.repository import GObject except: print "Failed import, aborting test" sys.exit(0) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -loop = gobject.MainLoop() +loop = GObject.MainLoop() exitcode = 0 @@ -21,7 +21,7 @@ def handle_noreceipt(): exitcode = 1 loop.quit() -gobject.timeout_add(7000, handle_noreceipt) +GObject.timeout_add(7000, handle_noreceipt) bus = dbus.SessionBus() |