From 02c1bd0946fe44119d51187602f3d1e6a9a0698c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 5 Jan 2020 18:42:37 +0800 Subject: [PATCH] Improve test coverage for service TCP/UDP. --- trunk/src/service/srs_service_st.cpp | 5 ----- trunk/src/utest/srs_utest_service.cpp | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index 30f8b120c..00d1b4380 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -263,27 +263,22 @@ srs_error_t do_srs_udp_listen(int fd, addrinfo* r, srs_netfd_t* pfd) srs_error_t err = srs_success; if ((err = srs_fd_closeexec(fd)) != srs_success) { - ::close(fd); return srs_error_wrap(err, "set closeexec"); } if ((err = srs_fd_reuseaddr(fd)) != srs_success) { - ::close(fd); return srs_error_wrap(err, "set reuseaddr"); } if ((err = srs_fd_reuseport(fd)) != srs_success) { - ::close(fd); return srs_error_wrap(err, "set reuseport"); } if (bind(fd, r->ai_addr, r->ai_addrlen) == -1) { - ::close(fd); return srs_error_new(ERROR_SOCKET_BIND, "bind"); } if ((*pfd = srs_netfd_open_socket(fd)) == NULL){ - ::close(fd); return srs_error_new(ERROR_ST_OPEN_SOCKET, "st open"); } diff --git a/trunk/src/utest/srs_utest_service.cpp b/trunk/src/utest/srs_utest_service.cpp index d42abd43d..f573ccc12 100644 --- a/trunk/src/utest/srs_utest_service.cpp +++ b/trunk/src/utest/srs_utest_service.cpp @@ -914,5 +914,13 @@ VOID TEST(TCPServerTest, TCPClientServer) HELPER_ASSERT_SUCCESS(c.read_fully(buf, 5, NULL)); EXPECT_STREQ("Hello", buf); } + + if (true) { + HELPER_ASSERT_SUCCESS(c.write((void*)"Hello", 5, NULL)); + + char buf[6]; HELPER_ARRAY_INIT(buf, 6, 0); + HELPER_ASSERT_SUCCESS(srs_read(c.stfd, buf, 5, NULL)); + EXPECT_STREQ("Hello", buf); + } }