[Draft]Test 32690

app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyChangePriceForConfigurableProductWithAssignedSimpleProductsTest.xml

@@ -80,7 +80,10 @@
         </createData>
 
         <!-- Assert first product in category -->
-        <magentoCLI command="cron:run" stepKey="runCron"/>
+        <!-- We need the 'indexer_update_all_views' job to run. This is the best
+            way we can make that happen, but there is no guarantee that there is
+            such a job already scheduled in the queue. -->
+        <magentoCLI command="cron:run  --group=index --bootstrap=standaloneProcessStarted=1" stepKey="runCron"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$firstSimpleCategory.custom_attributes[url_key]$$)}}" stepKey="goToFirstCategoryPageStorefront"/>
         <waitForPageLoad stepKey="waitForFirstCategoryPageLoad"/>
 

app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWhenChildProductPriceUpdatedTest.xml

@@ -166,7 +166,10 @@
         <updateData entity="SimpleProductUpdatePrice90" createDataKey="createConfigChildProduct1" stepKey="updateSimpleProductOne"/>
 
         <!-- Run cron -->
-        <magentoCron stepKey="runIndexCronJobs" groups="index"/>
+        <!-- We need the 'indexer_update_all_views' job to run. This is the best
+            way we can make that happen, but there is no guarantee that there is
+            such a job already scheduled in the queue. -->
+        <magentoCLI command="cron:run  --group=index --bootstrap=standaloneProcessStarted=1" stepKey="runIndexCronJobs"/>
         <comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
 
         <!-- Wait till cron job runs for schedule updates -->

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyProductAfterPartialReindexOnSeveralWebsitesTest.xml

@@ -82,7 +82,10 @@
         </actionGroup>
 
         <!-- Run cron -->
-        <magentoCLI command="cron:run" stepKey="runCron"/>
+        <!-- We need the 'indexer_update_all_views' job to run. This is the best
+            way we can make that happen, but there is no guarantee that there is
+            such a job already scheduled in the queue. -->
+        <magentoCLI command="cron:run --group=index --bootstrap=standaloneProcessStarted=1" stepKey="runCron"/>
 
         <!-- Check product is present in category after cron run -->
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">

app/code/Magento/Cron/Console/Command/CronCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -135,10 +136,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $params[ProcessCronQueueObserver::STANDALONE_PROCESS_STARTED] = $bootstrapOptionValue;
             }
         }
+
         /** @var Cron $cronObserver */
         $cronObserver = $objectManager->create(Cron::class, ['parameters' => $params]);
         $cronObserver->launch();
-        $output->writeln('<info>' . 'Ran jobs by schedule.' . '</info>');
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged,Magento2.Exceptions.TryProcessSystemResources.MissingTryCatch
+        if (stream_isatty(STDOUT)) {
+            $output->writeln('<info>' . 'Ran jobs by schedule.' . '</info>');
+        }
 
         return Cli::RETURN_SUCCESS;
     }

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -278,10 +278,12 @@ function ($a, $b) {
                 && $this->getCronGroupConfigurationValue($groupId, 'use_separate_process') == 1
             ) {
                 $this->_shell->execute(
-                    $phpPath . ' %s cron:run --group=' . $groupId . ' --' . Cli::INPUT_KEY_BOOTSTRAP . '='
+                    '%s %s cron:run --group=%s --' . Cli::INPUT_KEY_BOOTSTRAP . '='
                     . self::STANDALONE_PROCESS_STARTED . '=1',
                     [
-                        BP . '/bin/magento'
+                        $phpPath,
+                        BP . '/bin/magento',
+                        $groupId,
                     ]
                 );
                 continue;
@@ -854,7 +856,7 @@ private function processPendingJobs(string $groupId, array $jobsRoot, int $curre
         /** @var Schedule $schedule */
         foreach ($pendingJobs as $schedule) {
             if (isset($processedJobs[$schedule->getJobCode()])) {
-                // process only on job per run
+                // process only one of each job per run
                 continue;
             }
             $jobConfig = isset($jobsRoot[$schedule->getJobCode()]) ? $jobsRoot[$schedule->getJobCode()] : null;

app/code/Magento/Cron/Shell/CommandRendererBackground.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cron\Shell;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\OsInfo;
+use Magento\Framework\Shell\CommandRenderer;
+
+class CommandRendererBackground extends CommandRenderer
+{
+    /**
+     * @param Filesystem $filesystem
+     * @param OsInfo $osInfo
+     */
+    public function __construct(
+        private readonly Filesystem $filesystem,
+        private readonly OsInfo $osInfo,
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function render($command, array $arguments = []): string
+    {
+        $command = parent::render($command, $arguments);
+
+        $logFile = '/dev/null';
+        if ($groupId = $arguments[2] ?? null) {
+            $logDir = $this->filesystem->getDirectoryRead(DirectoryList::LOG)->getAbsolutePath();
+            // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
+            $logFile = escapeshellarg($logDir . 'magento.cron.' . $groupId . '.log');
+        }
+
+        return $this->osInfo->isWindows() ?
+            'start /B "magento background task" ' . $command
+            : str_replace('2>&1', ">> $logFile 2>&1 &", $command);
+    }
+}

app/code/Magento/Cron/Test/Unit/Console/Command/CronCommandTest.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Cron\Test\Unit\Console\Command;
@@ -80,7 +82,7 @@ public function testExecute()
             new CronCommand($this->objectManagerFactory, $this->deploymentConfigMock)
         );
         $commandTester->execute([]);
-        $expectedMsg = 'Ran jobs by schedule.' . PHP_EOL;
+        $expectedMsg = '';
         $this->assertEquals($expectedMsg, $commandTester->getDisplay());
     }
 }

app/code/Magento/Cron/Test/Unit/Shell/CommandRendererBackgroundTest.php

@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cron\Test\Unit\Shell;
+
+use Magento\Cron\Shell\CommandRendererBackground;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\OsInfo;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \Magento\Cron\Shell\CommandRendererBackground
+ */
+class CommandRendererBackgroundTest extends TestCase
+{
+    /**
+     * Test path to Magento's var/log directory
+     *
+     * @var string
+     */
+    protected $logPath = '/path/to/magento/var/log/';
+
+    /**
+     * Test data for command
+     *
+     * @var string
+     */
+    protected $testCommand = 'php -r test.php';
+
+    /**
+     * @var Filesystem|MockObject
+     */
+    protected $filesystem;
+
+    /**
+     * @var OsInfo|MockObject
+     */
+    protected $osInfo;
+
+    protected function setUp(): void
+    {
+        $this->osInfo = $this->getMockBuilder(OsInfo::class)
+            ->getMock();
+
+        $directoryMock = $this->getMockBuilder(ReadInterface::class)
+            ->getMock();
+        $directoryMock->expects($this->any())
+            ->method('getAbsolutePath')
+            ->willReturn($this->logPath);
+
+        $this->filesystem = $this->getMockBuilder(Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filesystem->expects($this->any())
+            ->method('getDirectoryRead')
+            ->willReturn($directoryMock);
+    }
+
+    /**
+     * @covers ::render
+     * @dataProvider commandPerOsTypeDataProvider
+     *
+     * @param bool $isWindows
+     * @param string $expectedResults
+     * @param string[] $arguments
+     */
+    public function testRender($isWindows, $expectedResults, $arguments)
+    {
+        $this->osInfo->expects($this->once())
+            ->method('isWindows')
+            ->willReturn($isWindows);
+
+        $commandRenderer = new CommandRendererBackground($this->filesystem, $this->osInfo);
+        $this->assertEquals(
+            $expectedResults,
+            $commandRenderer->render($this->testCommand, $arguments)
+        );
+    }
+
+    /**
+     * Data provider for each os type
+     *
+     * @return array
+     */
+    public function commandPerOsTypeDataProvider()
+    {
+        return [
+            'windows' => [
+                true,
+                'start /B "magento background task" ' . $this->testCommand . ' 2>&1',
+                [],
+            ],
+            'unix-without-group-name' => [
+                false,
+                $this->testCommand . ' >> /dev/null 2>&1 &',
+                [],
+            ],
+            'unix-with-group-name' => [
+                false,
+                $this->testCommand . " >> '{$this->logPath}magento.cron.group-name.log' 2>&1 &",
+                ['php-executable', 'script-path', 'group-name'],
+            ],
+        ];
+    }
+}

app/code/Magento/Cron/etc/di.xml

@@ -28,15 +28,14 @@
             </argument>
         </arguments>
     </virtualType>
-    <!-- @api -->
-    <virtualType name="shellBackground" type="Magento\Framework\Shell">
+    <virtualType name="shellBackgroundCron" type="Magento\Framework\Shell">
         <arguments>
-            <argument name="commandRenderer" xsi:type="object">Magento\Framework\Shell\CommandRendererBackground</argument>
+            <argument name="commandRenderer" xsi:type="object">Magento\Cron\Shell\CommandRendererBackground</argument>
         </arguments>
     </virtualType>
     <type name="Magento\Cron\Observer\ProcessCronQueueObserver">
         <arguments>
-            <argument name="shell" xsi:type="object">shellBackground</argument>
+            <argument name="shell" xsi:type="object">shellBackgroundCron</argument>
             <argument name="logger" xsi:type="object">Magento\Cron\Model\VirtualLogger</argument>
         </arguments>
     </type>
@@ -65,7 +64,7 @@
         <arguments>
             <argument name="tasks" xsi:type="array">
                 <item name="cronMagento" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
+                    <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run >> {magentoLog}magento.cron.log 2>&amp;1</item>
                     <item name="optional" xsi:type="boolean">false</item>
                 </item>
             </argument>

app/etc/di.xml

@@ -2008,4 +2008,10 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\Filter\Input\PurifierInterface" type="Magento\Framework\Filter\Input\Purifier"/>
+    <!-- @api -->
+    <virtualType name="shellBackground" type="Magento\Framework\Shell">
+        <arguments>
+            <argument name="commandRenderer" xsi:type="object">Magento\Framework\Shell\CommandRendererBackground</argument>
+        </arguments>
+    </virtualType>
 </config>