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

D-Bus testing: auto-sync multiple times 

Running an auto-sync multiple times was missing and promptly broke
during the auto-sync logic rewrite for SyncEvolution 1.3.
This commit is contained in:
Patrick Ohly 2012-11-04 17:11:22 +01:00
parent d4b85f9c62
commit f2583ff174
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/test-dbus.py
View File

@ -2805,7 +2805,7 @@ class TestSessionAPIsDummy(DBusUtil, unittest.TestCase):
"""TestSessionAPIsDummy.testAutoSyncLocalConfigErrorQuiet - test that auto-sync is triggered for local sync, fails due to permanent config error here, with no notification"""
self.doAutoSyncLocalConfigError(0)
def doAutoSyncLocalSuccess(self, notifyLevel):
def doAutoSyncLocalSuccess(self, notifyLevel, repeat=False):
# create @foobar config
self.session.Detach()
self.setUpSession("target-config@foobar")
@ -2856,20 +2856,26 @@ class TestSessionAPIsDummy(DBusUtil, unittest.TestCase):
self.session.Detach()
# wait for start and end of auto-sync session
loop.run()
loop.run()
self.assertEqual(DBusUtil.quit_events, ["session " + self.auto_sync_session_path + " ready",
"session " + self.auto_sync_session_path + " done"])
session = dbus.Interface(bus.get_object(self.server.bus_name,
self.auto_sync_session_path),
'org.syncevolution.Session')
reports = session.GetReports(0, 100, utf8_strings=True)
self.assertEqual(len(reports), 1)
self.assertEqual(reports[0]["status"], "200")
name = session.GetConfigName()
self.assertEqual(name, "dummy-test")
flags = session.GetFlags()
self.assertEqual(flags, [])
def run(operation, numSyncs):
logging.log(operation)
loop.run()
loop.run()
self.assertEqual(DBusUtil.quit_events, ["session " + self.auto_sync_session_path + " ready",
"session " + self.auto_sync_session_path + " done"])
session = dbus.Interface(bus.get_object(self.server.bus_name,
self.auto_sync_session_path),
'org.syncevolution.Session')
reports = session.GetReports(0, 100, utf8_strings=True)
self.assertEqual(len(reports), numSyncs)
self.assertEqual(reports[0]["status"], "200")
name = session.GetConfigName()
self.assertEqual(name, "dummy-test")
flags = session.GetFlags()
self.assertEqual(flags, [])
DBusUtil.quit_events = []
self.auto_sync_session_path = None
run('waiting for first auto sync', 1)
# check that org.freedesktop.Notifications.Notify was called
# when starting and completing the sync
@ -2908,8 +2914,12 @@ class TestSessionAPIsDummy(DBusUtil, unittest.TestCase):
' int32 -1\n']
or [])
# done as part of post-processing in runTest()
self.runTestDBusCheck = checkDBusLog
if repeat:
for i in range(1,3):
run('waiting for auto sync #%d' % i, i + 1)
else:
# done as part of post-processing in runTest()
self.runTestDBusCheck = checkDBusLog
@timeout(120)
def testAutoSyncLocalSuccess(self):
@ -2921,6 +2931,11 @@ class TestSessionAPIsDummy(DBusUtil, unittest.TestCase):
"""TestSessionAPIsDummy.testAutoSyncLocalSuccessQuiet - test that auto-sync is done successfully for local sync between file backends, without notifications"""
self.doAutoSyncLocalSuccess(1)
@timeout(240)
def testAutoSyncLocalMultiple(self):
"""TestSessionAPIsDummy.testAutoSyncLocalMultiple - test that auto-sync is done successfully for local sync between file backends, several times"""
self.doAutoSyncLocalSuccess(1, repeat=True)
class TestSessionAPIsReal(DBusUtil, unittest.TestCase):
""" This class is used to test those unit tests of session APIs, depending on doing sync.
Thus we need a real server configuration to confirm sync could be run successfully.