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

D-Bus testing: improved auto sync tests 

The auto sync tests failed when run in combination with other tests.
The root cause turned out to be side effects of these other tests,
but hardening the SessionChanged signal checking is useful anyway.
This commit is contained in:
Patrick Ohly 2011-07-20 23:04:47 +08:00
parent f21b829607
commit 8cdc408258
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/test-dbus.py
View File

@ -1334,6 +1334,9 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
}
self.sources = ['addressbook', 'calendar', 'todo', 'memo']
# set by SessionReady signal handlers in some tests
self.auto_sync_session_path = None
def run(self, result):
self.runTest(result)
@ -1895,7 +1898,9 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
self.session.SetConfig(True, False, config, utf8_strings=True)
def session_ready(object, ready):
if self.running and object != self.sessionpath:
if self.running and object != self.sessionpath and \
(self.auto_sync_session_path == None and ready or \
self.auto_sync_session_path == object):
self.auto_sync_session_path = object
DBusUtil.quit_events.append("session " + object + (ready and " ready" or " done"))
loop.quit()
@ -1932,6 +1937,7 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
flags = session.GetFlags()
self.failUnlessEqual(flags, [])
first_auto = self.auto_sync_session_path
self.auto_sync_session_path = None
# check that interval between auto-sync sessions is right
loop.run()
@ -1958,7 +1964,9 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
self.session.SetConfig(True, False, config, utf8_strings=True)
def session_ready(object, ready):
if self.running and object != self.sessionpath:
if self.running and object != self.sessionpath and \
(self.auto_sync_session_path == None and ready or \
self.auto_sync_session_path == object):
self.auto_sync_session_path = object
DBusUtil.quit_events.append("session " + object + (ready and " ready" or " done"))
loop.quit()