MC-19250: The stuck deployment on the Cloud because of consumers

Author: BaDos

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php

@@ -47,16 +47,22 @@ class QueueTestCaseAbstract extends \PHPUnit\Framework\TestCase
      */
     protected $publisherConsumerController;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->logFilePath = TESTS_TEMP_DIR . "/MessageQueueTestLog.txt";
-        $this->publisherConsumerController = $this->objectManager->create(PublisherConsumerController::class, [
-            'consumers' => $this->consumers,
-            'logFilePath' => $this->logFilePath,
-            'maxMessages' => $this->maxMessages,
-            'appInitParams' => \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams()
-        ]);
+        $this->publisherConsumerController = $this->objectManager->create(
+            PublisherConsumerController::class,
+            [
+                'consumers' => $this->consumers,
+                'logFilePath' => $this->logFilePath,
+                'maxMessages' => $this->maxMessages,
+                'appInitParams' => \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams()
+            ]
+        );
 
         try {
             $this->publisherConsumerController->initialize();
@@ -70,6 +76,9 @@ protected function setUp()
         $this->publisher = $this->publisherConsumerController->getPublisher();
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         $this->publisherConsumerController->stopConsumers();
@@ -85,24 +94,32 @@ protected function waitForAsynchronousResult($expectedLinesCount, $logFilePath)
     {
         try {
             //$expectedLinesCount, $logFilePath
-            $this->publisherConsumerController->waitForAsynchronousResult([$this, 'checkLogsExists'], [
-                $expectedLinesCount, $logFilePath
-            ]);
+            $this->publisherConsumerController->waitForAsynchronousResult(
+                [$this, 'checkLogsExists'],
+                [$expectedLinesCount, $logFilePath]
+            );
         } catch (PreconditionFailedException $e) {
             $this->fail($e->getMessage());
         }
     }
 
+    /**
+     * Checks that logs exist
+     *
+     * @param int $expectedLinesCount
+     * @return bool
+     */
     public function checkLogsExists($expectedLinesCount)
     {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
         $actualCount = file_exists($this->logFilePath) ? count(file($this->logFilePath)) : 0;
         return $expectedLinesCount === $actualCount;
     }
 
     /**
      * Workaround for https://bugs.php.net/bug.php?id=72286
      */
-    public static function tearDownAfterClass()
+    public function tearDownAfterClass()
     {
         if (version_compare(phpversion(), '7') == -1) {
             $closeConnection = new \ReflectionMethod(\Magento\Amqp\Model\Config::class, 'closeConnection');

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WaitAndNotWaitMessagesTest.php

@@ -23,18 +23,13 @@ class WaitAndNotWaitMessagesTest extends QueueTestCaseAbstract
      */
     private $filesystem;
 
-    /**
-     * @var ConfigFilePool
-     */
-    private $configFilePool;
-
     /**
      * @var array
      */
     private $config;
 
     /**
-     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     * @var AsyncTestData
      */
     protected $msgObject;