Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-22958

Author: rganin

dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php

@@ -10,6 +10,9 @@
  */
 namespace Magento\TestFramework\Helper;
 
+/**
+ * Integration Test Framework memory management logic.
+ */
 class Memory
 {
     /**
@@ -38,21 +41,21 @@ public function __construct(\Magento\Framework\Shell $shell)
     /**
      * Retrieve the effective memory usage of the current process
      *
-     * memory_get_usage() cannot be used because of the bug
-     * @link https://bugs.php.net/bug.php?id=62467
+     * Function memory_get_usage() cannot be used because of the bug
      *
+     * @link https://bugs.php.net/bug.php?id=62467
      * @return int Memory usage in bytes
      */
     public function getRealMemoryUsage()
     {
         $pid = getmypid();
         try {
+            // fall back to the Unix command line
+            $result = $this->_getUnixProcessMemoryUsage($pid);
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
             // try to use the Windows command line
             // some ports of Unix commands on Windows, such as MinGW, have limited capabilities and cannot be used
             $result = $this->_getWinProcessMemoryUsage($pid);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            // fall back to the Unix command line
-            $result = $this->_getUnixProcessMemoryUsage($pid);
         }
         return $result;
     }
@@ -100,9 +103,11 @@ protected function _getWinProcessMemoryUsage($pid)
      * @return int
      * @throws \InvalidArgumentException
      * @throws \OutOfBoundsException
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function convertToBytes($number)
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         if (!preg_match('/^(.*\d)\h*(\D)$/', $number, $matches)) {
             throw new \InvalidArgumentException("Number format '{$number}' is not recognized.");
         }
@@ -132,12 +137,14 @@ public static function convertToBytes($number)
      * - but the value has only one delimiter, such as "234,56", then it is impossible to know whether it is decimal
      *   separator or not. Only knowing the right format would allow this.
      *
-     * @param $number
+     * @param string $number
      * @return string
      * @throws \InvalidArgumentException
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     protected static function _convertToNumber($number)
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         preg_match_all('/(\D+)/', $number, $matches);
         if (count(array_unique($matches[0])) > 1) {
             throw new \InvalidArgumentException(
@@ -152,9 +159,11 @@ protected static function _convertToNumber($number)
      *
      * @link http://php.net/manual/en/function.php-uname.php
      * @return boolean
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function isMacOs()
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         return strtoupper(PHP_OS) === 'DARWIN';
     }
 }

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/MemoryTest.php

@@ -21,16 +21,7 @@ public function testGetRealMemoryUsageUnix()
     {
         $object = new \Magento\TestFramework\Helper\Memory($this->_shell);
         $this->_shell->expects(
-            $this->at(0)
-        )->method(
-            'execute'
-        )->with(
-            $this->stringStartsWith('tasklist.exe ')
-        )->will(
-            $this->throwException(new \Magento\Framework\Exception\LocalizedException(__('command not found')))
-        );
-        $this->_shell->expects(
-            $this->at(1)
+            $this->once()
         )->method(
             'execute'
         )->with(
@@ -44,7 +35,16 @@ public function testGetRealMemoryUsageUnix()
     public function testGetRealMemoryUsageWin()
     {
         $this->_shell->expects(
-            $this->once()
+            $this->at(0)
+        )->method(
+            'execute'
+        )->with(
+            $this->stringStartsWith('ps ')
+        )->will(
+            $this->throwException(new \Magento\Framework\Exception\LocalizedException(__('command not found')))
+        );
+        $this->_shell->expects(
+            $this->at(1)
         )->method(
             'execute'
         )->with(

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php

@@ -22,12 +22,15 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
 
     protected function setUp()
     {
-        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(PublisherConsumerController::class, [
-            'consumers' => $this->consumers,
-            'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
-            'maxMessages' => null,
-            'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
-        ]);
+        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(
+            PublisherConsumerController::class,
+            [
+                'consumers' => $this->consumers,
+                'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
+                'maxMessages' => null,
+                'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
+            ]
+        );
 
         try {
             $this->publisherConsumerController->startConsumers();
@@ -124,7 +127,7 @@ public function testSaveActionChangeVisibility($attributes)
 
         $this->publisherConsumerController->waitForAsynchronousResult(
             function () use ($repository) {
-                sleep(3);
+                sleep(10); // Should be refactored in the scope of MC-22947
                 return $repository->get(
                     'simple',
                     false,