fix(tests): refactor feature tests with server start command

k911 · Apr 17, 2021 · b3d4eef · b3d4eef
1 parent e738805
commit b3d4eef
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 202 deletions.
diff --git a/composer.json b/composer.json
@@ -109,7 +109,7 @@
             "phpunit tests/Unit --coverage-php cov/unit-tests.cov --colors=always"
         ],
         "feature-code-coverage": [
-            "COVERAGE=1 phpunit tests/Feature --coverage-php cov/feature-tests.cov --colors=always --process-isolation"
+            "COVERAGE=1 phpunit tests/Feature --coverage-php cov/feature-tests.cov --colors=always --process-isolation -d memory_limit=512M"
         ],
         "merge-code-coverage": [
             "phpcov merge cov --clover=cov/clover.xml"

diff --git a/src/Bridge/Symfony/Bundle/Command/AbstractServerStartCommand.php b/src/Bridge/Symfony/Bundle/Command/AbstractServerStartCommand.php
@@ -96,7 +96,8 @@ final protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($this->server->isRunning()) {
             $io->error('Swoole HTTP Server is already running');
-            exit(1);
+
+            return 1;
         }
 
         $swooleServer = $this->makeSwooleHttpServer();

diff --git a/src/Bridge/Symfony/Bundle/Command/ServerReloadCommand.php b/src/Bridge/Symfony/Bundle/Command/ServerReloadCommand.php
@@ -61,7 +61,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->server->reload();
         } catch (Throwable $ex) {
             $io->error($ex->getMessage());
-            exit(1);
+
+            return 1;
         }
 
         $io->success('Swoole HTTP Server\'s workers reloaded successfully');

diff --git a/src/Bridge/Symfony/Bundle/Command/ServerStartCommand.php b/src/Bridge/Symfony/Bundle/Command/ServerStartCommand.php
@@ -6,14 +6,10 @@
 
 use K911\Swoole\Bridge\Symfony\Bundle\Exception\CouldNotCreatePidFileException;
 use K911\Swoole\Bridge\Symfony\Bundle\Exception\PidFileNotAccessibleException;
-use function K911\Swoole\get_object_property;
 use K911\Swoole\Server\HttpServer;
 use K911\Swoole\Server\HttpServerConfiguration;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Console\Style\OutputStyle;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 final class ServerStartCommand extends AbstractServerStartCommand
@@ -57,37 +53,6 @@ protected function startServer(HttpServerConfiguration $serverConfiguration, Htt
             throw CouldNotCreatePidFileException::forPath($pidFile);
         }
 
-        $this->closeSymfonyStyle($io);
-
         $server->start();
     }
-
-    private function closeSymfonyStyle(SymfonyStyle $io): void
-    {
-        $output = get_object_property($io, 'output', OutputStyle::class);
-        if ($output instanceof ConsoleOutput) {
-            $this->closeConsoleOutput($output);
-        } elseif ($output instanceof StreamOutput) {
-            $this->closeStreamOutput($output);
-        }
-    }
-
-    /**
-     * Prevents usage of php://stdout or php://stderr while running in background.
-     */
-    private function closeConsoleOutput(ConsoleOutput $output): void
-    {
-        \fclose($output->getStream());
-
-        /** @var StreamOutput $streamOutput */
-        $streamOutput = $output->getErrorOutput();
-
-        $this->closeStreamOutput($streamOutput);
-    }
-
-    private function closeStreamOutput(StreamOutput $output): void
-    {
-        $output->setVerbosity(\PHP_INT_MIN);
-        \fclose($output->getStream());
-    }
 }
diff --git a/src/Bridge/Symfony/Bundle/Command/ServerStopCommand.php b/src/Bridge/Symfony/Bundle/Command/ServerStopCommand.php
@@ -61,7 +61,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->server->shutdown();
         } catch (Throwable $ex) {
             $io->error($ex->getMessage());
-            exit(1);
+
+            return 1;
         }
 
         $io->success('Swoole server shutdown successfully');

diff --git a/src/Bridge/Symfony/Bundle/EventListener/SwooleErrorOnConsoleTerminateEvent.php b/src/Bridge/Symfony/Bundle/EventListener/SwooleErrorOnConsoleTerminateEvent.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace K911\Swoole\Bridge\Symfony\Bundle\EventListener;
+
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
+
+final class SwooleErrorOnConsoleTerminateEvent
+{
+    public function onConsoleTerminate(ConsoleTerminateEvent $event): void
+    {
+        $swooleLastErrorNo = \swoole_last_error();
+        if (0 !== $swooleLastErrorNo) {
+            echo 'Swoole Error: '.\swoole_strerror($swooleLastErrorNo, 9).\PHP_EOL;
+        }
+    }
+}
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/services.yaml b/src/Bridge/Symfony/Bundle/Resources/config/services.yaml
@@ -194,3 +194,8 @@ services:
         autoconfigure: false
         arguments:
             $handler: '@K911\Swoole\Server\Runtime\ServerShutdown\SignalServerShutdownHandlerOnServerStart'
+
+    K911\Swoole\Bridge\Symfony\Bundle\EventListener\SwooleErrorOnConsoleTerminateEvent:
+        tags:
+            - name: kernel.event_listener
+              event: console.terminate
diff --git a/tests/Feature/SwooleServerCustomPidFileTest.php b/tests/Feature/SwooleServerCustomPidFileTest.php
@@ -24,11 +24,7 @@ public function testStartServerOnCustomPidFileLocation(): void
 
         self::assertFileDoesNotExist($pidFile);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function () use ($pidFile): void {
             $this->deferServerStop(\sprintf('--pid-file=%s', $pidFile));

diff --git a/tests/Feature/SwooleServerExceptionHandlerTest.php b/tests/Feature/SwooleServerExceptionHandlerTest.php
@@ -22,11 +22,7 @@ public function testCatchException(): void
             '--port=9999',
         ]);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -62,11 +58,7 @@ public function testCatchExceptionOnReactorRunningMode(): void
             '--port=9999',
         ], ['APP_ENV' => 'reactor']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -102,11 +94,7 @@ public function testCatchExceptionViaProductionExceptionHandler(): void
             '--port=9999',
         ], ['APP_ENV' => 'prod', 'APP_DEBUG' => '0']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -135,11 +123,7 @@ public function testCatchExceptionWithNoTrace(): void
             '--port=9999',
         ], ['APP_DEBUG' => '0']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -168,11 +152,7 @@ public function testExceptionHandlerJsonDefaultVerbosity(): void
             '--port=9999',
         ], ['APP_ENV' => 'exception_handler_json']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -204,11 +184,7 @@ public function testCatchExceptionViaSymfonyExceptionHandler(): void
             '--port=9999',
         ], ['APP_ENV' => 'exception_handler_symfony', 'APP_DEBUG' => '0']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -237,11 +213,7 @@ public function testCatchExceptionViaSymfonyExceptionHandlerWithDebug(): void
             '--port=9999',
         ], ['APP_ENV' => 'exception_handler_symfony', 'APP_DEBUG' => '1']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -270,11 +242,7 @@ public function testCustomExceptionHandler(): void
             '--port=9999',
         ], ['APP_ENV' => 'exception_handler_custom']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();

diff --git a/tests/Feature/SwooleServerHMRTest.php b/tests/Feature/SwooleServerHMRTest.php
@@ -29,11 +29,7 @@ public function testStartCallHMRCallStopWithAutoRegistration(): void
             '--port=9999',
         ], ['APP_ENV' => 'auto']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -70,11 +66,7 @@ public function testHMRDisabledByDefaultOnProduction(): void
             '--port=9999',
         ], ['APP_ENV' => 'prod']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();

diff --git a/tests/Feature/SwooleServerReloadCommandTest.php b/tests/Feature/SwooleServerReloadCommandTest.php
@@ -28,11 +28,7 @@ public function testStartCallReloadCallStop(): void
             '--port=9999',
         ]);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();

diff --git a/tests/Feature/SwooleServerReloadViaHttpApiTest.php b/tests/Feature/SwooleServerReloadViaHttpApiTest.php
@@ -31,11 +31,7 @@ public function testStartRequestApiToReloadCallStop(): void
             '--api-port=9998',
         ]);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();

diff --git a/tests/Feature/SwooleServerStartStopCommandTest.php b/tests/Feature/SwooleServerStartStopCommandTest.php
@@ -22,11 +22,7 @@ public function testStartCallStop(): void
             '--port=9999',
         ]);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -45,11 +41,7 @@ public function testStartCallStopOnReactorRunningMode(): void
             '--port=9999',
         ], ['APP_ENV' => 'reactor']);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();

diff --git a/tests/Feature/SwooleServerStatusCommandTest.php b/tests/Feature/SwooleServerStatusCommandTest.php
@@ -26,11 +26,7 @@ public function testCheckServerStatusViaProcess(): void
             '--api-port=9998',
         ]);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $this->runAsCoroutineAndWait(function (): void {
             $this->deferServerStop();
@@ -68,11 +64,7 @@ public function testCheckServerStatusViaCommandTester(): void
             '--api-port=9998',
         ]);
 
-        $serverStart->setTimeout(3);
-        $serverStart->disableOutput();
-        $serverStart->run();
-
-        $this->assertProcessSucceeded($serverStart);
+        $this->assertStartServerSucceeded($serverStart);
 
         $kernel = static::createKernel();
         $application = new Application($kernel);