Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed explicit log-level setting from tests, as it was interfering … #2155

Merged
merged 1 commit into from
Mar 20, 2019
Merged

Removed explicit log-level setting from tests, as it was interfering … #2155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions test/integration/int_client_server_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
16 changes: 0 additions & 16 deletions test/integration/mixer_fault_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down