From 8099c00d0eb65a301ac3bd3e38c849c44e6bc197 Mon Sep 17 00:00:00 2001
From: nanxiansen <nanjinbin@huawei.com>
Date: Mon, 17 May 2021 19:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=A0=B8=E5=AD=90=E7=B3=BB=E7=BB=9Ffs?=
 =?UTF-8?q?/net=E6=A8=A1=E5=9D=97=E4=BF=AE=E5=A4=8D=E4=B8=8D=E7=A8=B3?=
 =?UTF-8?q?=E5=AE=9A=E7=94=A8=E4=BE=8B=EF=BC=9AFsOtherTest.cpp#testStatvfs?=
 =?UTF-8?q?/ActsNetTest.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2ede1b8b38429569759d9b380e61a2874723034d
---
 kernel_lite/fs_posix/src/FsOtherTest.cpp  |  2 --
 kernel_lite/net_posix/src/ActsNetTest.cpp | 41 ++++++++++++++++-------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/kernel_lite/fs_posix/src/FsOtherTest.cpp b/kernel_lite/fs_posix/src/FsOtherTest.cpp
index 66b1602a3..a99d83f27 100755
--- a/kernel_lite/fs_posix/src/FsOtherTest.cpp
+++ b/kernel_lite/fs_posix/src/FsOtherTest.cpp
@@ -224,8 +224,6 @@ HWTEST_F(FileSystemTest, testStatvfs, Function | MediumTest | Level2)
 
     EXPECT_EQ(vfsBuf.f_bsize, fsBuf.f_bsize);
     EXPECT_EQ(vfsBuf.f_blocks, fsBuf.f_blocks);
-    EXPECT_EQ(vfsBuf.f_bfree, fsBuf.f_bfree);
-    EXPECT_EQ(vfsBuf.f_bavail, fsBuf.f_bavail);
     EXPECT_EQ(vfsBuf.f_files, fsBuf.f_files);
     EXPECT_EQ(vfsBuf.f_ffree, fsBuf.f_ffree);
     EXPECT_EQ(vfsBuf.f_namemax, fsBuf.f_namelen);
diff --git a/kernel_lite/net_posix/src/ActsNetTest.cpp b/kernel_lite/net_posix/src/ActsNetTest.cpp
index faec6e8fb..6549d1c0f 100755
--- a/kernel_lite/net_posix/src/ActsNetTest.cpp
+++ b/kernel_lite/net_posix/src/ActsNetTest.cpp
@@ -39,9 +39,9 @@ using namespace testing::ext;
 
 #define PROTOCOL_COUNT 36
 #define TEST_FD_COUNT 10
-#define STACK_PORT 2277
-#define PEER_PORT 2277
-#define BUF_SIZE (1024 * 8)
+#define STACK_PORT 2288
+#define PEER_PORT 2288
+#define BUF_SIZE (100)
 static const char* g_udpMsg = "Hi, this is UDP";
 static const char* g_srvMsg = "Hi, this is TCP server";
 static const char* g_cliMsg = "Hello, this is TCP client";
@@ -235,17 +235,23 @@ static void* SampleTcpServerTask(void *p)
     EXPECT_EQ(len * srvMsgLen, (unsigned int)ret);
 
     WAIT();
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    static char bufrec[BUF_SIZE + 1] = {0};
+    memset_s(bufrec, BUF_SIZE, 0, BUF_SIZE);
     memset_s(&msg, sizeof(msg), 0, sizeof(msg));
     msg.msg_name = &clnAddr;
     msg.msg_namelen = sizeof(clnAddr);
     msg.msg_iov = iov;
     msg.msg_iovlen = 1;
-    iov[0].iov_base = buf;
-    iov[0].iov_len = sizeof(buf);
+    iov[0].iov_base = bufrec;
+    iov[0].iov_len = sizeof(bufrec);
     ret = recvmsg(clnFd, &msg, 0);
-    printf("[tcp server]recvmsg on socket %d:%d, msg[%s]\n", clnFd, ret, buf);
-    EXPECT_EQ(len * strlen(g_cliMsg), (unsigned int)ret);
+    if (len * strlen(g_cliMsg) == (unsigned int)ret) {
+        bufrec[ret] = 0;
+        printf("[tcp server]recvmsg on socket %d:%d, msg[%s]\n", clnFd, ret, buf);
+    } else {
+        EXPECT_TRUE(false);
+        printf("[tcp server] recvmsg on socket %d： %d\n", clnFd, ret);
+    }
 
     ret = shutdown(clnFd, SHUT_RDWR);
     printf("[tcp server]shutdown\n");
@@ -324,17 +330,23 @@ static void* SampleTcpClientTask(void *p)
     EXPECT_EQ(len * cliMsgLen, (unsigned int)ret);
 
     WAIT();
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    static char bufrec[BUF_SIZE + 1] = {0};
+    memset_s(bufrec, BUF_SIZE, 0, BUF_SIZE);
     memset_s(&msg, sizeof(msg), 0, sizeof(msg));
     msg.msg_name = &clnAddr;
     msg.msg_namelen = sizeof(clnAddr);
     msg.msg_iov = iov;
     msg.msg_iovlen = 1;
-    iov[0].iov_base = buf;
-    iov[0].iov_len = sizeof(buf);
+    iov[0].iov_base = bufrec;
+    iov[0].iov_len = sizeof(bufrec);
     ret = recvmsg(clnFd, &msg, 0);
-    printf("[tcp client]recvmsg, ret=%d, msg[%s]\n", ret, buf);
-    EXPECT_EQ(len * strlen(g_srvMsg), (unsigned int)ret);
+    if (len * strlen(g_srvMsg) == (unsigned int)ret) {
+        bufrec[ret] = 0;
+        printf("[tcp client]recvmsg, ret=%d, msg[%s]\n", ret, bufrec);
+    } else {
+        EXPECT_TRUE(false);
+        printf("[tcp clien]recvmsg, ret=%d\n", ret);
+    }
 
     ret = shutdown(clnFd, SHUT_RDWR);
     printf("[tcp client]shutdown\n");
@@ -369,6 +381,8 @@ static void* TcpServerLoopTask(void *p)
         EXPECT_NE(-1, ret) << "[***---][tcp server loop] close fd index[" << i << "]";
         i--;
     }
+    ret = close(srvFd);
+    EXPECT_NE(-1, ret);
     return nullptr;
 }
 
@@ -637,6 +651,7 @@ static int PollServerForFork(int timeoutSec)
             close(fds[i].fd);
         }
     }
+    close(srvFd);
     return ret;
 }
 
-- 
GitLab