From 8f14e5b25385f838aed468929d3d790704c4f1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 17 Oct 2023 15:45:28 +0000 Subject: use EXPECT_TRUE instead of ASSERT_TRUE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 304028301 Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I640b2c1f1d3385acfa343c1bcd9eb48f36b2b729 --- tests/kernel_test.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/kernel_test.cpp b/tests/kernel_test.cpp index 489326a7..5a96c957 100644 --- a/tests/kernel_test.cpp +++ b/tests/kernel_test.cpp @@ -68,10 +68,10 @@ class KernelConfigVerifier final { */ TEST(KernelTest, TestRateLimitingSupport) { KernelConfigVerifier configVerifier; - ASSERT_TRUE(configVerifier.hasOption("CONFIG_NET_CLS_MATCHALL")); - ASSERT_TRUE(configVerifier.hasOption("CONFIG_NET_ACT_POLICE")); - ASSERT_TRUE(configVerifier.hasOption("CONFIG_NET_ACT_BPF")); - ASSERT_TRUE(configVerifier.hasOption("CONFIG_BPF_JIT")); + EXPECT_TRUE(configVerifier.hasOption("CONFIG_NET_CLS_MATCHALL")); + EXPECT_TRUE(configVerifier.hasOption("CONFIG_NET_ACT_POLICE")); + EXPECT_TRUE(configVerifier.hasOption("CONFIG_NET_ACT_BPF")); + EXPECT_TRUE(configVerifier.hasOption("CONFIG_BPF_JIT")); } TEST(KernelTest, TestBpfJitAlwaysOn) { @@ -99,19 +99,19 @@ TEST(KernelTest, TestKernel419) { TEST(KernelTest, TestSupportsCommonUsbEthernetDongles) { KernelConfigVerifier configVerifier; if (!configVerifier.hasModule("CONFIG_USB")) GTEST_SKIP() << "Exempt without USB support."; - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_AX8817X")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_AX88179_178A")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_CDCETHER")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_CDC_EEM")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_CDC_NCM")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_AX8817X")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_AX88179_178A")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_CDCETHER")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_CDC_EEM")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_CDC_NCM")); if (bpf::isAtLeastKernelVersion(5, 4, 0)) - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_AQC111")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_NET_AQC111")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_RTL8152")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_RTL8150")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_RTL8152")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_RTL8150")); if (bpf::isAtLeastKernelVersion(5, 15, 0)) { - ASSERT_TRUE(configVerifier.hasModule("CONFIG_USB_RTL8153_ECM")); - ASSERT_TRUE(configVerifier.hasModule("CONFIG_AX88796B_PHY")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_USB_RTL8153_ECM")); + EXPECT_TRUE(configVerifier.hasModule("CONFIG_AX88796B_PHY")); } } -- cgit v1.2.3