fix tests [3], --filter=[unit]

swoole · Oct 23, 2024 · e2df2dc · e2df2dc
1 parent 1ce0a5c
commit e2df2dc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/ext-src/swoole_http_response.cc b/ext-src/swoole_http_response.cc
@@ -1280,7 +1280,7 @@ static PHP_METHOD(swoole_http_response, create) {
         if (instanceof_function(Z_OBJCE_P(zobject), swoole_server_ce)) {
             serv = php_swoole_server_get_and_check_server(zobject);
             if (serv->get_connection_verify(fd) == nullptr) {
-                php_swoole_fatal_error(E_WARNING, "parameter $2 must be valid connection session id");
+                php_swoole_fatal_error(E_WARNING, "parameter $2 %d must be valid connection session id", fd);
                 RETURN_FALSE;
             }
         } else if (sw_zval_is_co_socket(zobject)) {

diff --git a/src/server/master.cc b/src/server/master.cc
@@ -2034,6 +2034,9 @@ void Server::init_pipe_sockets(MessageBus *mb) {
 
     SW_LOOP_N(n) {
         Worker *worker = get_worker(i);
+        if (i >= worker_num && task_ipc_mode != TASK_IPC_UNIXSOCK) {
+            continue;
+        }
         mb->init_pipe_socket(worker->pipe_master);
         mb->init_pipe_socket(worker->pipe_worker);
     }

diff --git a/tests/swoole_server/base/shutdown.phpt b/tests/swoole_server/base/shutdown.phpt
@@ -8,11 +8,13 @@ require __DIR__ . '/../../include/bootstrap.php';
 $pm = new SwooleTest\ProcessManager;
 $pm->initRandomData(1);
 $pm->parentFunc = function () use ($pm) {
-    go(function () use ($pm) {
+    Co\run(function () use ($pm) {
         $client = new Co\Client(SWOOLE_SOCK_TCP);
         Assert::assert($client->connect('127.0.0.1', $pm->getFreePort()));
         Assert::assert($client->send($pm->getRandomData()) > 0);
     });
+    $pm->kill();
+    $pm->wait();
 };
 $pm->childFunc = function () use ($pm) {
     $server = new Swoole\Server('127.0.0.1', $pm->getFreePort(), SWOOLE_BASE);
@@ -28,8 +30,9 @@ $pm->childFunc = function () use ($pm) {
         Assert::same($data, $pm->getRandomData());
         $server->shutdown();
     });
-    $server->on('shutdown', function () {
+    $server->on('shutdown', function () use ($pm) {
         echo "SHUTDOWN\n";
+        $pm->wakeup();
     });
     $server->start();
 };

diff --git a/tests/swoole_server/task/task_ipc_mode_3.phpt b/tests/swoole_server/task/task_ipc_mode_3.phpt
@@ -5,6 +5,10 @@ swoole_server/task: task_ipc_mode = 3
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';
+
+use Swoole\Http\Response;
+use Swoole\Http\Request;
+
 $atomic = new Swoole\Atomic;
 $pm = new SwooleTest\ProcessManager;
 $pm->parentFunc = function ($pid) use ($pm) {
@@ -15,7 +19,7 @@ $pm->parentFunc = function ($pid) use ($pm) {
     $pm->kill();
 };
 $pm->childFunc = function () use ($pm, $atomic) {
-    $server = new Swoole\Http\Server('127.0.0.1', $pm->getFreePort(), SERVER_MODE_RANDOM);
+    $server = new Swoole\Http\Server('127.0.0.1', $pm->getFreePort(), SWOOLE_PROCESS);
     $server->set([
         'log_file' => '/dev/null',
         'open_tcp_nodelay' => true,
@@ -29,12 +33,12 @@ $pm->childFunc = function () use ($pm, $atomic) {
             $pm->wakeup();
         }
     });
-    $server->on('request', function (Swoole\Http\Request $request, Swoole\Http\Response $response) use ($server) {
+    $server->on('request', function (Request $request, Response $response) use ($server) {
         $response->detach();
         $server->task($response->fd);
     });
     $server->on('task', function ($server, $task_id, $worker_id, string $fd) {
-        $response = Swoole\Http\Response::create($fd);
+        $response = Response::create($server, $fd);
         $response->end("Hello Swoole!\n");
     });
     $server->on('finish', function () { });