janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increased HTTP client read timeout in session manager and in regression tests.

Browse Source 
This fixes regression tests execution on slow hosts.
This commit is contained in:
Andrea Bondavalli 2020-04-01 17:39:48 +02:00
parent b14e0d56d7
commit 92768454f4
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/session_manager.cpp
View File

@ -18,6 +18,7 @@
//
#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH 4096 //max for SDP file
#define CPPHTTPLIB_READ_TIMEOUT_SECOND 10
#include <httplib.h>
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>

19
daemon/tests/daemon_test.cpp
View File

@ -18,6 +18,7 @@
//
#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH 4096 //max for SDP file
#define CPPHTTPLIB_READ_TIMEOUT_SECOND 30
#include <httplib.h>
#include <boost/foreach.hpp>
#include <boost/asio.hpp>
@ -100,15 +101,19 @@ struct Client {
socket_.set_option(
multicast::join_group(address::from_string(g_sap_address).to_v4(),
address::from_string(g_daemon_address).to_v4()));
cli_.set_timeout_sec(30);
}
bool is_alive() {
auto res = cli_.Get("/");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
std::pair<bool, std::string> get_config() {
auto res = cli_.Get("/api/config");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
@ -116,16 +121,19 @@ struct Client {
std::ostringstream os;
os << "{ \"domain\": " << domain << ", \"dscp\": " << dscp << " }";
auto res = cli_.Post("/api/ptp/config", os.str(), "application/json");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
std::pair<bool, std::string> get_ptp_status() {
auto res = cli_.Get("/api/ptp/status");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
std::pair<bool, std::string> get_ptp_config() {
auto res = cli_.Get("/api/ptp/config");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
@ -146,42 +154,49 @@ struct Client {
)";
std::string url = std::string("/api/source/") + std::to_string(id);
auto res = cli_.Put(url.c_str(), json, "application/json");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
std::pair<bool, std::string> get_source_sdp(int id) {
std::string url = std::string("/api/source/sdp/") + std::to_string(id);
auto res = cli_.Get(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
std::pair<bool, std::string> get_sink_status(int id) {
std::string url = std::string("/api/sink/status/") + std::to_string(id);
auto res = cli_.Get(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
std::pair<bool, std::string> get_streams() {
std::string url = std::string("/api/streams");
auto res = cli_.Get(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
std::pair<bool, std::string> get_sources() {
std::string url = std::string("/api/sources");
auto res = cli_.Get(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
std::pair<bool, std::string> get_sinks() {
std::string url = std::string("/api/sinks");
auto res = cli_.Get(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}
bool remove_source(int id) {
std::string url = std::string("/api/source/") + std::to_string(id);
auto res = cli_.Delete(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
@ -201,6 +216,7 @@ struct Client {
std::string url = std::string("/api/sink/") + std::to_string(id);
auto res = cli_.Put(url.c_str(), json, "application/json");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
@ -222,12 +238,14 @@ struct Client {
std::string("/api/source/sdp/") + std::to_string(id) + "\"\n}";
std::string url = std::string("/api/sink/") + std::to_string(id);
auto res = cli_.Put(url.c_str(), json, "application/json");
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
bool remove_sink(int id) {
std::string url = std::string("/api/sink/") + std::to_string(id);
auto res = cli_.Delete(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return (res->status == 200);
}
@ -287,6 +305,7 @@ struct Client {
std::pair<bool, std::string> get_remote_sources() {
std::string url = std::string("/api/browse/sources");
auto res = cli_.Get(url.c_str());
BOOST_REQUIRE_MESSAGE(res != nullptr, "server returned response");
return std::make_pair(res->status == 200, res->body);
}