Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions test/server/config_validation/server_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class JsonApplicationLogsValidationServerForbiddenFlagvTest : public ValidationS
}
};

class JsonApplicationLogsValidationServerForbiddenFlag_Test : public ValidationServerTest {
class JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest : public ValidationServerTest {
public:
static void SetUpTestSuite() { // NOLINT(readability-identifier-naming)
setupTestDirectory();
Expand Down Expand Up @@ -306,7 +306,7 @@ INSTANTIATE_TEST_SUITE_P(
::testing::ValuesIn(
JsonApplicationLogsValidationServerForbiddenFlagvTest::getAllConfigFiles()));

TEST_P(JsonApplicationLogsValidationServerForbiddenFlag_Test, TestForbiddenFlag) {
TEST_P(JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest, TestForbiddenFlag) {
Thread::MutexBasicLockable access_log_lock;
Stats::IsolatedStoreImpl stats_store;
DangerousDeprecatedTestTime time_system;
Expand All @@ -320,9 +320,9 @@ TEST_P(JsonApplicationLogsValidationServerForbiddenFlag_Test, TestForbiddenFlag)
}

INSTANTIATE_TEST_SUITE_P(
AllConfigs, JsonApplicationLogsValidationServerForbiddenFlag_Test,
AllConfigs, JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest,
::testing::ValuesIn(
JsonApplicationLogsValidationServerForbiddenFlag_Test::getAllConfigFiles()));
JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest::getAllConfigFiles()));

} // namespace
} // namespace Server
Expand Down
2 changes: 1 addition & 1 deletion test/server/server_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ TEST_P(ServerInstanceImplTest, JsonApplicationLogFailWithForbiddenFlagv) {
"setJsonLogFormat error: INVALID_ARGUMENT: Usage of %v is unavailable for JSON log formats");
}

TEST_P(ServerInstanceImplTest, JsonApplicationLogFailWithForbiddenFlag_) {
TEST_P(ServerInstanceImplTest, JsonApplicationLogFailWithForbiddenFlagUnderscore) {
EXPECT_THROW_WITH_MESSAGE(
initialize("test/server/test_data/server/json_application_log_forbidden_flag_.yaml"),
EnvoyException,
Expand Down