Pipeline adjustments.6

Jacked-PHP · Sep 30, 2024 · 292f1ca · 292f1ca
1 parent e27eadb
commit 292f1ca
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 34 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,5 +24,4 @@ jobs:
         shell: bash
         run: |
           cd /var/www/jacked-server
-          sudo vendor/bin/phpunit
-          # sudo -u www-data -- vendor/bin/phpunit
+          sudo -u www-data -- vendor/bin/phpunit
diff --git a/tests/Feature/HttpServerTest.php b/tests/Feature/HttpServerTest.php
@@ -5,7 +5,6 @@
 use JackedPhp\JackedServer\Helpers\Config;
 use OpenSwoole\Coroutine;
 use OpenSwoole\Coroutine\Http\Client as CoroutineHttpClient;
-use OpenSwoole\Process;
 use Tests\TestCase;
 
 class HttpServerTest extends TestCase
@@ -14,7 +13,7 @@ public function test_can_get_base_input()
     {
         $configFile = ROOT_DIR . '/config/jacked-server-http.php';
 
-        $serverPid = $this->startServer(configFile: $configFile);
+        $this->startServer(configFile: $configFile);
         $status = null;
         $outcome = '';
 
@@ -32,15 +31,15 @@ public function test_can_get_base_input()
         );
         $this->assertEquals(200, $status);
 
-        Process::kill($serverPid, SIGKILL);
+        self::tearServerDown();
         sleep(3);
     }
 
     public function test_can_send_post()
     {
         $configFile = ROOT_DIR . '/config/jacked-server-http.php';
 
-        $serverPid = $this->startServer(configFile: $configFile);
+        $this->startServer(configFile: $configFile);
         $status = null;
         $outcome = '';
         $expectedData = json_encode(['data' => 'test']);
@@ -64,15 +63,15 @@ public function test_can_send_post()
         );
         $this->assertEquals(200, $status);
 
-        Process::kill($serverPid, SIGKILL);
+        self::tearServerDown();
         sleep(3);
     }
 
     public function test_can_send_form()
     {
         $configFile = ROOT_DIR . '/config/jacked-server-http.php';
 
-        $serverPid = $this->startServer(configFile: $configFile);
+        $this->startServer(configFile: $configFile);
         $status = null;
         $outcome = '';
         $expectedData = ['data' => 'test'];
@@ -96,7 +95,7 @@ public function test_can_send_form()
         );
         $this->assertEquals(200, $status);
 
-        Process::kill($serverPid, SIGKILL);
+        self::tearServerDown();
         sleep(3);
     }
 }
diff --git a/tests/Feature/Traits/ServerTrait.php b/tests/Feature/Traits/ServerTrait.php
@@ -56,7 +56,8 @@ public static function tearServerDown(): void
     {
         $processName = 'jacked-server-process';
         $command = "ps aux | grep '$processName' | grep -v grep | awk '{print $2}' | xargs -I {} kill -9 {}";
-        Coroutine::run(fn() => System::exec($command));
+
+        Coroutine::run(fn() => System::exec($command, get_error_stream: true));
 
         $output2 = self::getServerProcesses();
         if (!empty($output2)) {

diff --git a/tests/Feature/WsServerTest.php b/tests/Feature/WsServerTest.php
@@ -2,8 +2,6 @@
 
 namespace Tests\Feature;
 
-use Error;
-use Exception;
 use JackedPhp\JackedServer\Helpers\Config;
 use OpenSwoole\Atomic;
 use OpenSwoole\Coroutine;
@@ -12,25 +10,9 @@
 use Tests\TestCase;
 use Kanata\ConveyorServerClient\Client;
 use Throwable;
-use WebSocket\ConnectionException;
 
 class WsServerTest extends TestCase
 {
-    /** @var array<int>  */
-    protected array $processesPids;
-
-    /**
-     * @after
-     * @return void
-     */
-    public function stopProcesses(): void
-    {
-        foreach ($this->processesPids as $pid) {
-            Process::kill($pid, SIGKILL);
-        }
-        sleep(3);
-    }
-
     protected function startWsClient(
         string $configFile,
         ?callable $onReadyCallback = null,
@@ -76,7 +58,7 @@ protected function startWsClient(
             redirectStdIO: true,
             enableCoroutine: false,
         );
-        $this->processesPids[] = $process->start();
+        $process->start();
 
         if (null !== $processTimeout) {
             $process->setTimeout($processTimeout);
@@ -113,7 +95,7 @@ public function test_can_broadcast_message()
         $configFile = ROOT_DIR . '/config/jacked-server.php';
 
         // @throws Exception
-        $this->processesPids[] = $this->startServer(configFile: $configFile);
+        $this->startServer(configFile: $configFile);
 
         $atomic = new Atomic();
 
@@ -147,14 +129,17 @@ public function test_can_broadcast_message()
         usleep(300000); // 0.3 sec
 
         $this->assertEquals('Message received: Test Message 1', $result);
+
+        self::tearServerDown();
+        sleep(3);
     }
 
     public function test_can_authenticate_remote_server_at_handshake(): void
     {
         $configFile = ROOT_DIR . '/ws-auth/jacked-server-with-ws-auth.php';
 
         // @throws Exception
-        $this->processesPids[] = $this->startServer(configFile: $configFile);
+        $this->startServer(configFile: $configFile);
 
         $token1 = $this->getToken($configFile);
         $token2 = $this->getToken($configFile);
@@ -194,16 +179,17 @@ public function test_can_authenticate_remote_server_at_handshake(): void
         usleep(300000); // 0.3 sec
 
         $this->assertEquals('Message received: Test Message 1', $result);
+
+        self::tearServerDown();
+        sleep(3);
     }
 
     public function test_fail_to_authenticate_remote_server_at_handshake(): void
     {
         $configFile = ROOT_DIR . '/ws-auth/jacked-server-with-ws-auth-2.php';
 
         // @throws Exception
-        $this->processesPids[] = $this->startServer(
-            configFile: $configFile,
-        );
+        $this->startServer(configFile: $configFile);
 
         $process = $this->startWsClient(
             onReadyCallback: function ($client, $worker) {
@@ -230,5 +216,8 @@ public function test_fail_to_authenticate_remote_server_at_handshake(): void
             needle: '403',
             haystack: $parsedResult['rawMessage'],
         );
+
+        self::tearServerDown();
+        sleep(3);
     }
 }