summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2011-09-05 14:38:31 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2011-09-05 14:38:31 +0200
commit75d8c449cde91c705f182523016c8256ea8d020f (patch)
tree58302e9f52ee7f6b602c9208e24953b05799346f
parentbc7ffea5de19cab5b298c2b86ee8abcb2158f9de (diff)
src/linux/integration-test: Fully port to GI
Move from static glib to GI GLib module, to avoid mixing static and dynamic bindings. This fixes the tests to work with pygobject 3.
-rwxr-xr-xsrc/linux/integration-test4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linux/integration-test b/src/linux/integration-test
index 55f1306..1d6a5b3 100755
--- a/src/linux/integration-test
+++ b/src/linux/integration-test
@@ -24,8 +24,8 @@ import subprocess
import unittest
import shutil
import time
-import glib
+from gi.repository import GLib
from gi.repository import Gio
UP = 'org.freedesktop.UPower'
@@ -169,7 +169,7 @@ class Tests(unittest.TestCase):
try:
self.get_dbus_property('DaemonVersion')
break
- except glib.GError:
+ except GLib.GError:
pass
self.proxy = Gio.DBusProxy.new_sync(self.dbus,