MC-23978: Indexer:reindex return wrong status code

Author: SeruyV

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -74,7 +74,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $returnValue = Cli::RETURN_FAILURE;
+        $returnValue = Cli::RETURN_SUCCESS;
         foreach ($this->getIndexers($input) as $indexer) {
             try {
                 $this->validateIndexerStatus($indexer);
@@ -97,14 +97,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(
                     __('has been rebuilt successfully in %time', ['time' => gmdate('H:i:s', $resultTime)])
                 );
-                $returnValue = Cli::RETURN_SUCCESS;
             } catch (LocalizedException $e) {
                 $output->writeln(__('exception: %message', ['message' => $e->getMessage()]));
+                $returnValue = Cli::RETURN_FAILURE;
             } catch (\Exception $e) {
                 $output->writeln('process unknown error:');
                 $output->writeln($e->getMessage());
 
                 $output->writeln($e->getTraceAsString(), OutputInterface::VERBOSITY_DEBUG);
+                $returnValue = Cli::RETURN_FAILURE;
             }
         }
 

dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php

@@ -7,9 +7,11 @@
 
 namespace Magento\Indexer\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -19,7 +21,7 @@
  * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
  */
-class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
+class IndexerReindexCommandTest extends TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -56,14 +58,23 @@ protected function setUp(): void
 
     /**
      * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
+     * @return void
      */
-    public function testReindexAll()
+    public function testReindexAll(): void
     {
         $status = $this->command->run($this->inputMock, $this->outputMock);
-        $this->assertEquals(
-            \Magento\Framework\Console\Cli::RETURN_SUCCESS,
-            $status,
-            'Index wasn\'t success'
-        );
+        $this->assertEquals(Cli::RETURN_SUCCESS, $status, 'Index wasn\'t success');
+    }
+
+    /**
+     * Check that 'indexer:reindex' command return right code.
+     *
+     * @magentoDataFixture Magento/Indexer/_files/wrong_config_data.php
+     * @return void
+     */
+    public function testReindexAllWhenSomethingIsWrong(): void
+    {
+        $status = $this->command->run($this->inputMock, $this->outputMock);
+        $this->assertEquals(Cli::RETURN_FAILURE, $status, 'Index didn\'t return failure code');
     }
 }

dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config\Factory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Factory $configFactory */
+$configFactory = Bootstrap::getObjectManager()->get(Factory::class);
+$config = $configFactory->create();
+$config->setScope('stores');
+$config->setDataByPath('catalog/search/elasticsearch7_server_port', 2309);
+$config->save();

dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ResourceConnection $resource */
+$resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+$connection = $resource->getConnection();
+$tableName = $resource->getTableName('core_config_data');
+
+$connection->query("DELETE FROM $tableName WHERE path = 'catalog/search/elasticsearch7_server_port'"
+    ." AND scope = 'stores';");