Fix tests [18] --filter=[core]

Author: matyhtf

core-tests/src/network/client.cpp

@@ -420,11 +420,7 @@ TEST(client, bind) {
     ASSERT_EQ(cli.bind("192.0.0.1", 9999), SW_ERR);
     ASSERT_ERREQ(EADDRNOTAVAIL);
     ASSERT_EQ(cli.bind("127.0.0.1", 80), SW_ERR);
-    if (swoole::test::is_github_ci()) {
-        ASSERT_ERREQ(EINVAL);
-    } else {
-        ASSERT_ERREQ(EACCES);
-    }
+    ASSERT_ERREQ(EACCES);
 }
 
 // DNS 报文头部结构

include/swoole_client.h

@@ -152,7 +152,7 @@ class Client {
         return recv_(this, _data, _length, _flags);
     }
 
-    int bind(const std::string &addr, int port);
+    int bind(const std::string &addr, int port) const;
     int sleep();
     int wakeup();
     int sendto(const std::string &host, int port, const char *data, size_t len) const;

run-core-tests.sh

@@ -12,7 +12,14 @@ cd "${__DIR__}" || exit 1
 
 tasks=$(./bin/core-tests --gtest_list_tests | awk '/\./') || exit 255
 for task in $tasks; do
-    ./bin/core-tests --gtest_filter="$task"*
+    execute_command="./bin/core-tests"
+
+    if [ "$task" = "log." ]; then
+        $execute_command --gtest_filter="$task"*
+    else
+        sudo -E "$execute_command" --gtest_filter="$task"*
+    fi
+
     if [ $? -ne 0 ]; then
         exit 255
     fi

src/coroutine/socket.cc

@@ -26,8 +26,7 @@
 #include "swoole_coroutine_socket.h"
 #include "swoole_coroutine_system.h"
 
-namespace swoole {
-namespace coroutine {
+namespace swoole::coroutine {
 Socket::TimeoutType Socket::timeout_type_list[4] = {TIMEOUT_DNS, TIMEOUT_CONNECT, TIMEOUT_READ, TIMEOUT_WRITE};
 
 void Socket::timer_callback(Timer *timer, TimerNode *tnode) {
@@ -423,19 +422,13 @@ double Socket::get_timeout(const TimeoutType type) const {
 String *Socket::get_read_buffer() {
     if (sw_unlikely(!read_buffer)) {
         read_buffer = make_string(SW_BUFFER_SIZE_BIG, buffer_allocator);
-        if (!read_buffer) {
-            throw std::bad_alloc();
-        }
     }
     return read_buffer;
 }
 
 String *Socket::get_write_buffer() {
     if (sw_unlikely(!write_buffer)) {
         write_buffer = make_string(SW_BUFFER_SIZE_BIG, buffer_allocator);
-        if (!write_buffer) {
-            throw std::bad_alloc();
-        }
     }
     return write_buffer;
 }
@@ -643,17 +636,17 @@ bool Socket::connect(const std::string &_host, int _port, int flags) {
         break;
     }
 
-    if (connect(&server_addr.addr.ss, server_addr.len) == false) {
+    if (!connect(&server_addr.addr.ss, server_addr.len)) {
         return false;
     }
 
     // socks5 proxy
-    if (socks5_proxy && socks5_handshake() == false) {
+    if (socks5_proxy && !socks5_handshake()) {
         set_err(SW_ERROR_SOCKS5_HANDSHAKE_FAILED);
         return false;
     }
     // http proxy
-    if (http_proxy && !http_proxy->dont_handshake && http_proxy_handshake() == false) {
+    if (http_proxy && !http_proxy->dont_handshake && !http_proxy_handshake()) {
         set_err(SW_ERROR_HTTP_PROXY_HANDSHAKE_FAILED);
         return false;
     }
@@ -1711,6 +1704,4 @@ bool Socket::TimeoutController::has_timedout(const enum TimeoutType _type) {
     }
     return false;
 }
-
-}  // namespace coroutine
-}  // namespace swoole
+}  // namespace swoole::coroutine

src/network/address.cc

@@ -22,7 +22,8 @@ static bool IN_IS_ADDR_LOOPBACK(const in_addr *a) {
     return a->s_addr == htonl(INADDR_LOOPBACK);
 }
 
-namespace swoole::network {
+namespace swoole {
+namespace network {
 static thread_local char tmp_address[INET6_ADDRSTRLEN];
 
 const char *Address::addr_str(int family, const void *addr) {
@@ -178,5 +179,5 @@ bool Address::is_loopback_addr() const {
     }
     return false;
 }
-
-}  // namespace swoole::network
+}  // namespace network
+}  // namespace swoole

src/network/client.cc

@@ -28,7 +28,6 @@
 
 namespace swoole {
 namespace network {
-
 static int Client_inet_addr(Client *cli, const char *host, int port);
 static int Client_tcp_connect_sync(Client *cli, const char *host, int port, double _timeout, int nonblock);
 static int Client_tcp_connect_async(Client *cli, const char *host, int port, double timeout, int nonblock);
@@ -107,7 +106,7 @@ Client::Client(SocketType _type, bool _async) : async(_async) {
     protocol.onPackage = Client_onPackage;
 }
 
-int Client::bind(const std::string &addr, int port) {
+int Client::bind(const std::string &addr, int port) const {
     if (socket->set_reuse_addr() < 0) {
         swoole_sys_warning("setsockopt(%d, SO_REUSEADDR) failed", socket->get_fd());
     }