diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-10-17 15:45:28 +0000 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2023-10-17 15:54:34 +0000 |
| commit | 8f14e5b25385f838aed468929d3d790704c4f1cd (patch) | |
| tree | 23404e907de25b70068be9221980a519a1f34a9b /tests | |
| parent | 4519a8d8cee3b5a106dfe05ec676c462c1537985 (diff) | |
| download | netd-8f14e5b25385f838aed468929d3d790704c4f1cd.tar.gz | |
use EXPECT_TRUE instead of ASSERT_TRUE
Bug: 304028301
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I640b2c1f1d3385acfa343c1bcd9eb48f36b2b729
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kernel_test.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
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")); } } |