From 87c5f3cef8afb26ad60c4a5b237b3f3dcbb43f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Fri, 18 Nov 2022 11:46:55 -0500 Subject: [PATCH] misc: fix ut_conversation_call Change-Id: I6dc0b22f4336dde4db1d6a869e4447ad51d809ff --- test/unitTest/conversation/call.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unitTest/conversation/call.cpp b/test/unitTest/conversation/call.cpp index d4bed4932e..85a3162955 100644 --- a/test/unitTest/conversation/call.cpp +++ b/test/unitTest/conversation/call.cpp @@ -821,8 +821,9 @@ ConversationCallTest::testJoinWhileActiveCall() && data.messages.rbegin()->at("type") == "application/call-history+json"; }; // should get message - cv.wait_for(lk, 30s, [&]() { return lastCommitIsCall(aliceData_); }); + CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return lastCommitIsCall(aliceData_); })); + auto confId = aliceData_.messages.rbegin()->at("confId"); libjami::addConversationMember(aliceId, aliceData_.id, bobUri); CPPUNIT_ASSERT(cv.wait_for(lk, 60s, [&]() { return bobData_.requestReceived; })); @@ -834,13 +835,12 @@ ConversationCallTest::testJoinWhileActiveCall() CPPUNIT_ASSERT(libjami::getActiveCalls(bobId, bobData_.id).size() == 1); - // hangup bob MUST NOT stop the conference aliceData_.messages.clear(); bobData_.messages.clear(); aliceData_.conferenceChanged = false; - Manager::instance().hangupCall(aliceId, callId); + Manager::instance().hangupConference(aliceId, confId); - CPPUNIT_ASSERT(!cv.wait_for(lk, 10s, [&]() { return aliceData_.conferenceRemoved; })); + CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return aliceData_.conferenceRemoved; })); } void -- GitLab