From 486e97802580b2eae127199fa7b181ae0cb45d1d Mon Sep 17 00:00:00 2001 From: Edouard Tisserant Date: Fri, 17 Feb 2017 19:52:21 +0100 Subject: [PATCH] Reflect latest changes in Engine's GroupMerge branch --- src/pEpmodule.cc | 4 +++- test/mp_sync_test.py | 2 +- test/multipEp.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc index 18be6a0..08447f6 100644 --- a/src/pEpmodule.cc +++ b/src/pEpmodule.cc @@ -352,9 +352,11 @@ BOOST_PYTHON_MODULE(pEp) .value("SYNC_NOTIFY_INIT_ADD_OUR_DEVICE" , SYNC_NOTIFY_INIT_ADD_OUR_DEVICE) .value("SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE" , SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE) .value("SYNC_NOTIFY_INIT_FORM_GROUP" , SYNC_NOTIFY_INIT_FORM_GROUP) + .value("SYNC_NOTIFY_INIT_MOVE_OUR_DEVICE" , SYNC_NOTIFY_INIT_MOVE_OUR_DEVICE) .value("SYNC_NOTIFY_TIMEOUT" , SYNC_NOTIFY_TIMEOUT) .value("SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED" , SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED) - .value("SYNC_NOTIFY_ACCEPTED_GROUP_CREATED", SYNC_NOTIFY_ACCEPTED_GROUP_CREATED); + .value("SYNC_NOTIFY_ACCEPTED_GROUP_CREATED", SYNC_NOTIFY_ACCEPTED_GROUP_CREATED) + .value("SYNC_NOTIFY_ACCEPTED_DEVICE_MOVED" , SYNC_NOTIFY_ACCEPTED_DEVICE_MOVED); auto sync_mixin_class = class_( "SyncMixIn", diff --git a/test/mp_sync_test.py b/test/mp_sync_test.py index c2eb9df..6221153 100644 --- a/test/mp_sync_test.py +++ b/test/mp_sync_test.py @@ -123,7 +123,7 @@ def nokey_in_a_group_of_3_members(): ("GroupA1", [create_account, ["second@group.a", "GroupA Second"]]), (flush_all_mails,), ("GroupA1", [decrypt_message, [enc_msg]], expect(pEp.PEP_rating.PEP_rating_have_no_key)), - (cycle_until_no_change, ["GroupA1", "GroupA2", "GroupA3"], expect(2)), + (cycle_until_no_change, ["GroupA1", "GroupA2", "GroupA3"], expect(5)), ("GroupA1", [decrypt_message, [enc_msg]], expect(pEp.PEP_rating.PEP_rating_reliable)), ("GroupA2", [create_account, ["second@group.a", "GroupA Second"]]), ("GroupA2", [decrypt_message, [enc_msg]], expect(pEp.PEP_rating.PEP_rating_reliable)), diff --git a/test/multipEp.py b/test/multipEp.py index 88d2c5d..8ab1dcf 100644 --- a/test/multipEp.py +++ b/test/multipEp.py @@ -275,7 +275,8 @@ def pEp_instance_run(iname, _own_addresses, conn, _msgs_folders, _handshakes_see if signal in [ pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_ADD_OUR_DEVICE, pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE, - pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_FORM_GROUP]: + pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_FORM_GROUP, + pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_MOVE_OUR_DEVICE]: printheader("show HANDSHAKE dialog") printi("handshake needed between " + repr(me) + " and " + repr(partner)) tw = pEp.trustwords(me, partner, 'en')