Skip to content

Commit 4adb5ce

Browse files
committed
revert [19] --filter=[core]
1 parent 4098b7c commit 4adb5ce

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

core-tests/src/network/client.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,11 @@ TEST(client, bind) {
420420
ASSERT_EQ(cli.bind("192.0.0.1", 9999), SW_ERR);
421421
ASSERT_ERREQ(EADDRNOTAVAIL);
422422
ASSERT_EQ(cli.bind("127.0.0.1", 80), SW_ERR);
423-
ASSERT_ERREQ(EACCES);
423+
if (swoole::test::is_github_ci()) {
424+
ASSERT_ERREQ(EINVAL);
425+
} else {
426+
ASSERT_ERREQ(EACCES);
427+
}
424428
}
425429

426430
// DNS 报文头部结构

src/coroutine/socket.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#include "swoole_coroutine_socket.h"
2727
#include "swoole_coroutine_system.h"
2828

29-
namespace swoole::coroutine {
29+
namespace swoole {
30+
namespace coroutine {
3031
Socket::TimeoutType Socket::timeout_type_list[4] = {TIMEOUT_DNS, TIMEOUT_CONNECT, TIMEOUT_READ, TIMEOUT_WRITE};
3132

3233
void Socket::timer_callback(Timer *timer, TimerNode *tnode) {
@@ -1704,4 +1705,5 @@ bool Socket::TimeoutController::has_timedout(const enum TimeoutType _type) {
17041705
}
17051706
return false;
17061707
}
1707-
} // namespace swoole::coroutine
1708+
} // namespace coroutine
1709+
} // namespace swoole

0 commit comments

Comments
 (0)