0
0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-19 19:52:15 +02:00

Make ssl related unit tests verbosity not print debug output by default

These unit tests are quite nosiy on a normal unit test run. Lower the
SSL verbosity for them to avoid a lot of debug output during unit tests.

Signed-off-by: Arne Schwabe <arne@openvpn.net>
This commit is contained in:
Arne Schwabe 2024-07-11 16:25:50 +02:00 committed by Jenkins-dev
parent 3fe0138d9e
commit e46f663b07
2 changed files with 17 additions and 2 deletions

View File

@ -241,6 +241,8 @@ I/+4kAlXuAKdhsXohHeBhC2ijg/kTOMDxEbEVv+SkCIUyM+dB8UtlPKOH9HEL5Xi
+BpDSqO6Bha5+NAVUU7OdDsnzRwSWaD6lwIBAgICAOE=
-----END DH PARAMETERS-----)";
static constexpr int debug_output = 0;
static inline bool xfer_oneway(SslApiBuilder &sender, SslApiBuilder &recv, std::string out)
{
if (sender.get().read_ciphertext_ready())
@ -283,12 +285,12 @@ static inline void xfer(AccHandshaker &cli, AccHandshaker &serv)
do
{
if (sdata)
if (sdata && debug_output)
std::cout << "CLIENT <-- SERVER: " << sdata->size() << " bytes\n";
cdata = cli.process_msg(sdata);
try
{
if (cdata)
if (cdata && debug_output)
std::cout << "CLIENT --> SERVER: " << cdata->size() << " bytes\n";
sdata = serv.process_msg(cdata);
}
@ -319,6 +321,8 @@ SSLLib::SSLAPI::Config::Ptr CreateServerConfig(const std::string &pvtKey,
config->load_cert(cert);
config->load_private_key(pvtKey);
config->load_ca(ca, false);
// Do not log extra data during unit test
config->set_debug_level(debug_output);
return config;
}
@ -344,6 +348,9 @@ SSLLib::SSLAPI::Config::Ptr CreateClientConfig(const std::string &pvtKey,
else
config->load_ca(ca, false);
// Do not log extra data during unit test
config->set_debug_level(debug_output);
return config;
}

View File

@ -247,6 +247,8 @@ I/+4kAlXuAKdhsXohHeBhC2ijg/kTOMDxEbEVv+SkCIUyM+dB8UtlPKOH9HEL5Xi
TEST(sslctx_ut, create_config)
{
SSLLib::SSLAPI::Config::Ptr config = new SSLLib::SSLAPI::Config;
// Do not log extra data during unit test
config->set_debug_level(0);
EXPECT_TRUE(config);
}
@ -263,6 +265,9 @@ TEST(sslctx_ut, config_new_factory_server)
config->load_private_key(pvt_key_txt);
config->load_ca(cert_txt, false);
// Do not log extra data during unit test
config->set_debug_level(0);
auto factory_server = config->new_factory();
EXPECT_TRUE(factory_server);
@ -283,6 +288,9 @@ TEST(sslctx_ut, config_new_factory_client)
config->load_private_key(pvt_key_txt);
config->load_ca(cert_txt, false);
// Do not log extra data during unit test
config->set_debug_level(0);
auto factory_client = config->new_factory();
EXPECT_TRUE(factory_client);