From 6c1539d257b0c2b266815d40b4bb40dcee5b2828 Mon Sep 17 00:00:00 2001
From: Dmitri Dolguikh <ddolguik@redhat.com>
Date: Wed, 6 Mar 2019 13:01:47 -0800
Subject: [PATCH] Removed explicit log-level setting from tests, as it was
 interfering with cli '-l' option

---
 test/integration/int_client_server_test.cc | 10 ----------
 test/integration/mixer_fault_test.cc       | 16 ----------------
 2 files changed, 26 deletions(-)

diff --git a/test/integration/int_client_server_test.cc b/test/integration/int_client_server_test.cc
index b229d7f5b74..c93d370428c 100644
--- a/test/integration/int_client_server_test.cc
+++ b/test/integration/int_client_server_test.cc
@@ -47,8 +47,6 @@ class ClientServerTest : public testing::Test,
 };
 
 TEST_F(ClientServerTest, HappyPath) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::info);
-
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
 
@@ -116,8 +114,6 @@ TEST_F(ClientServerTest, HappyPath) {
 }
 
 TEST_F(ClientServerTest, AcceptAndClose) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::info);
-
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
 
@@ -188,8 +184,6 @@ TEST_F(ClientServerTest, AcceptAndClose) {
 }
 
 TEST_F(ClientServerTest, SlowResponse) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::info);
-
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
 
@@ -258,8 +252,6 @@ TEST_F(ClientServerTest, SlowResponse) {
 }
 
 TEST_F(ClientServerTest, NoServer) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::info);
-
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
 
@@ -315,8 +307,6 @@ TEST_F(ClientServerTest, NoServer) {
 }
 
 TEST_F(ClientServerTest, NoAccept) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::info);
-
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
 
diff --git a/test/integration/mixer_fault_test.cc b/test/integration/mixer_fault_test.cc
index 8757a8bf477..83618e28b57 100644
--- a/test/integration/mixer_fault_test.cc
+++ b/test/integration/mixer_fault_test.cc
@@ -305,8 +305,6 @@ class MixerFaultTest : public Envoy::HttpIntegrationTest, public testing::Test {
 };
 
 TEST_F(MixerFaultTest, HappyPath) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   constexpr NetworkFailPolicy fail_policy = NetworkFailPolicy::FAIL_CLOSED;
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
@@ -386,8 +384,6 @@ TEST_F(MixerFaultTest, HappyPath) {
 }
 
 TEST_F(MixerFaultTest, FailClosedAndClosePolicySocketAfterAccept) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   constexpr NetworkFailPolicy fail_policy = NetworkFailPolicy::FAIL_CLOSED;
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
@@ -478,8 +474,6 @@ TEST_F(MixerFaultTest, FailClosedAndClosePolicySocketAfterAccept) {
 }
 
 TEST_F(MixerFaultTest, FailClosedAndSendPolicyResponseSlowly) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   constexpr NetworkFailPolicy fail_policy = NetworkFailPolicy::FAIL_CLOSED;
   constexpr uint32_t connections_to_initiate = 30 * 30;
   constexpr uint32_t requests_to_send = 1 * connections_to_initiate;
@@ -603,8 +597,6 @@ TEST_F(MixerFaultTest, FailClosedAndSendPolicyResponseSlowly) {
 }
 
 TEST_F(MixerFaultTest, TolerateTelemetryBlackhole) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   constexpr NetworkFailPolicy fail_policy = NetworkFailPolicy::FAIL_CLOSED;
   constexpr uint32_t connections_to_initiate = 30;
   constexpr uint32_t requests_to_send = 30 * connections_to_initiate;
@@ -761,8 +753,6 @@ TEST_F(MixerFaultTest, TolerateTelemetryBlackhole) {
 }
 
 TEST_F(MixerFaultTest, FailOpenAndSendPolicyResponseSlowly) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   constexpr NetworkFailPolicy fail_policy = NetworkFailPolicy::FAIL_OPEN;
   constexpr uint32_t connections_to_initiate = 30 * 30;
   constexpr uint32_t requests_to_send = 1 * connections_to_initiate;
@@ -891,8 +881,6 @@ TEST_F(MixerFaultTest, FailOpenAndSendPolicyResponseSlowly) {
 }
 
 TEST_F(MixerFaultTest, RetryOnTransportError) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   uint32_t retries = 10;
   uint32_t base_retry_ms = 1;
   uint32_t max_retry_ms = 10;
@@ -1039,8 +1027,6 @@ TEST_F(MixerFaultTest, RetryOnTransportError) {
 }
 
 TEST_F(MixerFaultTest, CancelCheck) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   uint32_t retries = 10;
   uint32_t base_retry_ms = 1;
   uint32_t max_retry_ms = 10;
@@ -1209,8 +1195,6 @@ TEST_F(MixerFaultTest, CancelCheck) {
 }
 
 TEST_F(MixerFaultTest, CancelRetry) {
-  Envoy::Logger::Registry::setLogLevel(spdlog::level::err);
-
   // Force client timeout while requests are waiting between retries.
   uint32_t retries = 1;
   uint32_t base_retry_ms = 10'000;