diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/glib/test-service-glib.c | 4 | ||||
-rwxr-xr-x | test/python/run-test.sh | 4 | ||||
-rwxr-xr-x | test/python/test-client.py | 11 |
3 files changed, 10 insertions, 9 deletions
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c index 06cc5957..6d10b937 100644 --- a/test/glib/test-service-glib.c +++ b/test/glib/test-service-glib.c @@ -670,7 +670,9 @@ my_object_get_value (MyObject *obj, guint *ret, GError **error) gboolean my_object_echo_variant (MyObject *obj, GValue *variant, GValue *ret, GError **error) { - g_value_init (ret, G_VALUE_TYPE(variant)); + GType t; + t = G_VALUE_TYPE(variant); + g_value_init (ret, t); g_value_copy (variant, ret); return TRUE; diff --git a/test/python/run-test.sh b/test/python/run-test.sh index aa6bd366..a50a5f48 100755 --- a/test/python/run-test.sh +++ b/test/python/run-test.sh @@ -32,6 +32,10 @@ echo "running test-client.py" #uncomment this if you need to see the output from the service for debugging #otherwise keep it commented so we can test activation #libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/python/test-service.py & +#libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/glib/test-service-glib & +#sleep 1 +#ps +#sleep 9 libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/python/test-client.py || die "test-client.py failed" rm $DBUS_TOP_BUILDDIR/python/dbus diff --git a/test/python/test-client.py b/test/python/test-client.py index f90ce13c..57965cc7 100755 --- a/test/python/test-client.py +++ b/test/python/test-client.py @@ -25,9 +25,9 @@ test_types_vals = [1, 12323231, 3.14159265, 99999999.99, "dude", "123", "What is all the fuss about?", "gob@gob.com", [1,2,3], ["how", "are", "you"], [1.23,2.3], [1], ["Hello"], (1,2,3), (1,), (1,"2",3), ("2", "what"), ("you", 1.2), - {1:"a", 2:"b"}, {"a":1, "b":2}, {1:1.1, 2:2.2}, {1.1:"a", 1.2:"b"}, - [[1,2,3],[2,3,4]], [["a","b"],["c","d"]], - ([1,2,3],"c", 1.2, ["a","b","c"], {"a": (1,"v"), "b": (2,"d")}) + {1:"a", 2:"b"}, {"a":1, "b":2}, #{"a":(1,"B")}, + {1:1.1, 2:2.2}, [[1,2,3],[2,3,4]], [["a","b"],["c","d"]], + #([1,2,3],"c", 1.2, ["a","b","c"], {"a": (1,"v"), "b": (2,"d")}) ] class TestDBusBindings(unittest.TestCase): @@ -129,9 +129,6 @@ class TestDBusPythonToGLibBindings(unittest.TestCase): print "Call test passed" self.assert_(True) - #this crashes glib so disable it for now - #until glib is fixed - """ def testPythonTypes(self): print "\n********* Testing Python Types ***********" @@ -139,11 +136,9 @@ class TestDBusPythonToGLibBindings(unittest.TestCase): print "Testing %s"% str(send_val) recv_val = self.iface.EchoVariant(send_val) self.assertEquals(send_val, recv_val) - """ if __name__ == '__main__': gobject.threads_init() dbus.glib.init_threads() unittest.main() - |