Commit 1d0a01e3 authored by Matthieu Tanon's avatar Matthieu Tanon

Skip bodyless test and clean code

parent 7c71baaa
......@@ -394,11 +394,7 @@ void linphone_account_creator_set_user_data(LinphoneAccountCreator *creator, voi
void linphone_account_creator_set_proxy_config(LinphoneAccountCreator *creator, LinphoneProxyConfig *cfg) {
LinphoneProxyConfig *old_cfg = creator->proxy_cfg;
if (cfg) {
creator->proxy_cfg = linphone_proxy_config_ref(cfg);
} else {
creator->proxy_cfg = NULL;
}
creator->proxy_cfg = cfg ? linphone_proxy_config_ref(cfg) : NULL;
if (old_cfg) {
linphone_proxy_config_unref(old_cfg);
......
......@@ -57,9 +57,10 @@ void ParticipantDevice::setConferenceSubscribeEvent (LinphoneEvent *ev) {
}
AbstractChatRoom::SecurityLevel ParticipantDevice::getSecurityLevel () const {
if (getCore()->getEncryptionEngine())
return getCore()->getEncryptionEngine()->getSecurityLevel(mGruu.asString());
return AbstractChatRoom::SecurityLevel::ClearText;
auto encryptionEngine = getCore()->getEncryptionEngine();
if (encryptionEngine)
return encryptionEngine->getSecurityLevel(mGruu.asString());
return AbstractChatRoom::SecurityLevel::ClearText; // Undefined / Unknown
}
ostream &operator<< (ostream &stream, ParticipantDevice::State state) {
......
......@@ -1259,6 +1259,7 @@ static void test_subscribe_on_wrong_dialog(void) {
}
#endif
#if 0
static void test_list_subscribe_wrong_body(void) {
LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
......@@ -1282,6 +1283,7 @@ static void test_list_subscribe_wrong_body(void) {
linphone_core_manager_destroy(marie);
linphone_address_unref(sub_addr);
}
#endif
static void redis_publish_subscribe(void) {
......@@ -2062,7 +2064,7 @@ test_t flexisip_tests[] = {
#endif
TEST_NO_TAG("Publish/unpublish", test_publish_unpublish),
TEST_NO_TAG("List subscribe", test_list_subscribe),
TEST_NO_TAG("List subscribe without body", test_list_subscribe_wrong_body),
//TEST_NO_TAG("List subscribe without body", test_list_subscribe_wrong_body),
TEST_NO_TAG("File transfer message rcs to external body client", file_transfer_message_rcs_to_external_body_client),
TEST_NO_TAG("DoS module trigger by sending a lot of chat messages", dos_module_trigger),
#if HAVE_SIPP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment