From fbc92e1714dfa7aaaa51b16a7f4a7ffccf9e2761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Szab=C3=B3?= Date: Sun, 28 Jul 2024 01:52:35 +0200 Subject: [PATCH] Skip CompressionCodecManagerTest when compression is disabled mcrouter compression support is specific to the caret protocol, which is not available in OSS (D5341688). As such, skip relevant tests when running in OSS. --- .../lib/test/CompressionCodecManagerTest.cpp | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/mcrouter/lib/test/CompressionCodecManagerTest.cpp b/mcrouter/lib/test/CompressionCodecManagerTest.cpp index 39e48a48c..c12038687 100644 --- a/mcrouter/lib/test/CompressionCodecManagerTest.cpp +++ b/mcrouter/lib/test/CompressionCodecManagerTest.cpp @@ -36,7 +36,16 @@ void validateCodec(CompressionCodec* codec) { } // anonymous namespace -TEST(CompressionCodecManager, basic) { +class CompressionCodecManagerTest : public ::testing::Test { + protected: + void SetUp() override { + #ifdef DISABLE_COMPRESSION + GTEST_SKIP() << "compression is not available in the OSS build"; + #endif // DISABLE_COMPRESSION + } +}; + +TEST_F(CompressionCodecManagerTest, basic) { std::unordered_map codecConfigs; for (uint32_t i = 1; i <= 64; ++i) { codecConfigs.emplace( @@ -57,7 +66,7 @@ TEST(CompressionCodecManager, basic) { } } -TEST(CompressionCodecManager, basicNotEnabledWithFilters) { +TEST_F(CompressionCodecManagerTest, basicNotEnabledWithFilters) { constexpr size_t kTypeId = 1; std::unordered_map codecConfigs; FilteringOptions filters; @@ -93,7 +102,7 @@ TEST(CompressionCodecManager, basicNotEnabledWithFilters) { EXPECT_EQ(0, enabledCodecs); } -TEST(CompressionCodecManager, basicEnabled) { +TEST_F(CompressionCodecManagerTest, basicEnabled) { std::unordered_map codecConfigs; for (uint32_t i = 1; i <= 64; ++i) { codecConfigs.emplace( @@ -124,7 +133,7 @@ TEST(CompressionCodecManager, basicEnabled) { EXPECT_EQ(64, enabledCodecs); } -TEST(CompressionCodecManager, missingStart) { +TEST_F(CompressionCodecManagerTest, missingStart) { std::unordered_map codecConfigs; for (uint32_t i = 10; i <= 64; ++i) { codecConfigs.emplace( @@ -149,7 +158,7 @@ TEST(CompressionCodecManager, missingStart) { } } -TEST(CompressionCodecManager, missingMiddle) { +TEST_F(CompressionCodecManagerTest, missingMiddle) { std::unordered_map codecConfigs; for (uint32_t i = 1; i <= 20; ++i) { codecConfigs.emplace( @@ -180,7 +189,7 @@ TEST(CompressionCodecManager, missingMiddle) { } } -TEST(CompressionCodecManager, missingEnd) { +TEST_F(CompressionCodecManagerTest, missingEnd) { std::unordered_map codecConfigs; for (uint32_t i = 1; i <= 50; ++i) { codecConfigs.emplace( @@ -205,7 +214,7 @@ TEST(CompressionCodecManager, missingEnd) { } } -TEST(CompressionCodecManager, invalidDictionary) { +TEST_F(CompressionCodecManagerTest, invalidDictionary) { std::unordered_map codecConfigs; codecConfigs.emplace( 1, @@ -233,7 +242,7 @@ TEST(CompressionCodecManager, invalidDictionary) { validateCodec(codecMap->get(3)); } -TEST(CompressionCodecManager, getBest_validateCodecs) { +TEST_F(CompressionCodecManagerTest, getBest_validateCodecs) { auto codecConfigs = testCodecConfigs(); CompressionCodecManager codecManager(std::move(codecConfigs)); folly::EventBase evb; @@ -248,7 +257,7 @@ TEST(CompressionCodecManager, getBest_validateCodecs) { } } -TEST(CompressionCodecManager, getBest_noMatches) { +TEST_F(CompressionCodecManagerTest, getBest_noMatches) { auto codecConfigs = testCodecConfigs(); CompressionCodecManager codecManager(std::move(codecConfigs)); folly::EventBase evb; @@ -285,7 +294,7 @@ TEST(CompressionCodecManager, getBest_noMatches) { CodecIdRange{1, 10}, 0 /* body size */, 1 /* reply type id */)); } -TEST(CompressionCodecManager, getBest_matches) { +TEST_F(CompressionCodecManagerTest, getBest_matches) { auto codecConfigs = testCodecConfigs(); CompressionCodecManager codecManager(std::move(codecConfigs)); folly::EventBase evb; @@ -331,7 +340,7 @@ TEST(CompressionCodecManager, getBest_matches) { CodecIdRange{1, 15}, 123 /* body size */, 1 /* reply type id */)); } -TEST(CompressionCodecManager, getBest_serverWithoutCodecs) { +TEST_F(CompressionCodecManagerTest, getBest_serverWithoutCodecs) { std::unordered_map codecConfigs; CompressionCodecManager codecManager(std::move(codecConfigs)); folly::EventBase evb;