commit 10a2ed58fff5ff42ad18a0b57916e5a42bda73c7
author Maciej Żenczykowski <maze@google.com> Wed Mar 27 15:46:26 2019 -0700
committer Maciej Żenczykowski <maze@google.com> Wed Mar 27 22:16:16 2019 -0700
tree 19a4364657df0b0480d6b8574e8392bef99b7a25
parent 983c01c25122698dd2d722c4254ce68dae9b99ee

ClatUtilsTest - unique_fd only supports -1 not -errno

The unique_fd destructor calls close() on anything that isn't -1,
so it would for example call close(-EINVAL) since -EINVAL != -1.

While we're at it convert some EXPECT_* to ASSERT_* for clarity.

Test: atest netd_unit_test
Bug: 65674744
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I068d8986f27dd848a39c69dae7fd286a9b6d4b8a

server/ClatUtilsTest.cpp

diff --git a/server/ClatUtilsTest.cpp b/server/ClatUtilsTest.cpp
index 6321e16..58ff95d 100644
--- a/server/ClatUtilsTest.cpp
+++ b/server/ClatUtilsTest.cpp
@@ -34,11 +34,11 @@
 };
 
 TEST_F(ClatUtilsTest, HardwareAddressTypeOfNonExistingIf) {
-    EXPECT_EQ(-ENODEV, hardwareAddressType("not_existing_if"));
+    ASSERT_EQ(-ENODEV, hardwareAddressType("not_existing_if"));
 }
 
 TEST_F(ClatUtilsTest, HardwareAddressTypeOfLoopback) {
-    EXPECT_EQ(ARPHRD_LOOPBACK, hardwareAddressType("lo"));
+    ASSERT_EQ(ARPHRD_LOOPBACK, hardwareAddressType("lo"));
 }
 
 // If wireless 'wlan0' interface exists it should be Ethernet.
@@ -46,7 +46,7 @@
     int type = hardwareAddressType("wlan0");
     if (type == -ENODEV) return;
 
-    EXPECT_EQ(ARPHRD_ETHER, type);
+    ASSERT_EQ(ARPHRD_ETHER, type);
 }
 
 // If cellular 'rmnet_data0' interface exists it should
@@ -55,33 +55,36 @@
     int type = hardwareAddressType("rmnet_data0");
     if (type == -ENODEV) return;
 
-    EXPECT_NE(ARPHRD_ETHER, type);
+    ASSERT_NE(ARPHRD_ETHER, type);
 
     // ARPHRD_RAWIP is 530 on some pre-4.14 Qualcomm devices.
     if (type == 530) return;
 
-    EXPECT_EQ(ARPHRD_RAWIP, type);
+    ASSERT_EQ(ARPHRD_RAWIP, type);
 }
 
 TEST_F(ClatUtilsTest, GetClatMapFd) {
     SKIP_IF_BPF_NOT_SUPPORTED;
 
-    base::unique_fd ufd(getClatMapFd());
-    EXPECT_LE(3, ufd);  // 0,1,2 - stdin/out/err, thus 3 <= fd
+    int fd = getClatMapFd();
+    ASSERT_LE(3, fd);  // 0,1,2 - stdin/out/err, thus 3 <= fd
+    close(fd);
 }
 
 TEST_F(ClatUtilsTest, GetClatRawIpProgFd) {
     SKIP_IF_BPF_NOT_SUPPORTED;
 
-    base::unique_fd ufd(getClatProgFd(false));
-    EXPECT_LE(3, ufd);
+    int fd = getClatProgFd(false);
+    ASSERT_LE(3, fd);
+    close(fd);
 }
 
 TEST_F(ClatUtilsTest, GetClatEtherProgFd) {
     SKIP_IF_BPF_NOT_SUPPORTED;
 
-    base::unique_fd ufd(getClatProgFd(true));
-    EXPECT_LE(3, ufd);
+    int fd = getClatProgFd(true);
+    ASSERT_LE(3, fd);
+    close(fd);
 }
 
 }  // namespace net