maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

D-Bus testing: increase message bus timeout 

For interactive debugging it is better to have an infinite timeout of
the D-Bus method call. The overall test will still time out as quickly
as it did before.
This commit is contained in:
Patrick Ohly 2013-04-09 21:26:34 +02:00
parent 5344aa0239
commit 6156ae620c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/test-dbus.py
View File

@ -428,6 +428,9 @@ class DBusUtil(Timeout):
pserver = None
pmonitor = None
storedenv = {}
# Choose a very long timeout for method calls;
# 'infinite' doesn't seem to be documented for Python.
dbusTimeout = 100000
def getTestProperty(self, key, default):
"""retrieve values set with @property()"""
@ -937,9 +940,9 @@ Use check=lambda: (expr1, expr2, ...) when more than one check is needed.
If wait=True, then this call blocks until the session is ready.
"""
if flags:
sessionpath = self.server.StartSessionWithFlags(config, flags)
sessionpath = self.server.StartSessionWithFlags(config, flags, timeout=self.dbusTimeout)
else:
sessionpath = self.server.StartSession(config)
sessionpath = self.server.StartSession(config, timeout=self.dbusTimeout)
def session_ready(object, ready):
if self.running and ready and object == sessionpath:
@ -956,7 +959,7 @@ Use check=lambda: (expr1, expr2, ...) when more than one check is needed.
session = dbus.Interface(bus.get_object(self.server.bus_name,
sessionpath),
'org.syncevolution.Session')
status, error, sources = session.GetStatus(utf8_strings=True)
status, error, sources = session.GetStatus(utf8_strings=True, timeout=self.dbusTimeout)
if wait and status == "queueing":
# wait for signal
loop.run()
@ -1102,8 +1105,8 @@ Use check=lambda: (expr1, expr2, ...) when more than one check is needed.
config["source/addressbook"] = addressbook
if enableCalendar:
config["source/calendar"] = calendar
self.session.SetConfig(False, False, config)
self.session.Detach()
self.session.SetConfig(False, False, config, timeout=self.dbusTimeout)
self.session.Detach(timeout=self.dbusTimeout)
self.setUpSession("server")
config = {"" : { "loglevel": "4",
"syncURL": "local://@client",
@ -1120,7 +1123,7 @@ Use check=lambda: (expr1, expr2, ...) when more than one check is needed.
"backend": "file",
"databaseFormat": "text/calendar",
"database": "file://" + xdg_root + "/server-calendar" }
self.session.SetConfig(False, False, config)
self.session.SetConfig(False, False, config, timeout=self.dbusTimeout)
def setUpFiles(self, snapshot):
""" Copy reference directory trees from
@ -5436,7 +5439,7 @@ class TestCmdline(DBusUtil, unittest.TestCase):
pass
if sessionFlags != None:
self.assertTrue(self.session)
self.assertEqual(self.session.GetFlags(), sessionFlags)
self.assertEqual(self.session.GetFlags(timeout=self.dbusTimeout), sessionFlags)
return (out, err, s.returncode)