diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | test/name-test/test-activation-forking.py | 6 | ||||
| -rwxr-xr-x | test/name-test/test-wait-for-echo.py | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 70d31b7e..aab78c65 100644 --- a/configure.ac +++ b/configure.ac @@ -263,14 +263,14 @@ AM_CONDITIONAL([DBUS_ENABLE_INSTALLED_TESTS], if test "x$enable_tests" = xyes; then # full test coverage is required, Python is a hard dependency - AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi]) AM_PATH_PYTHON([2.6]) AC_MSG_CHECKING([for Python modules for full test coverage]) - if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then + if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) + AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules]) fi else # --enable-tests not given: do not abort if Python is missing 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() |