Merge pull request #1403 from magento-nord/MAGETWO-71431

Fixed issue:
MAGETWO-71431 ImportProductsTest random failures

Author: igrybkov

dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml

@@ -29,6 +29,10 @@
                     </item>
                 </item>
             </data>
+            <data name="indexerType" xsi:type="array">
+                <item name="0" xsi:type="string">catalog_category_product</item>
+                <item name="1" xsi:type="string">catalog_product_category</item>
+             </data>
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsOnStorefront" />
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportedProducts" />
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
@@ -45,6 +49,10 @@
             <data name="import/data/import_file/template/entities" xsi:type="string">4</data>
             <data name="import/data/import_file/entities/0" xsi:type="string">catalogProductSimple::default_in_custom_website</data>
             <data name="import/data/import_file/entities/1" xsi:type="string">catalogProductSimple::default</data>
+            <data name="indexerType" xsi:type="array">
+                <item name="0" xsi:type="string">catalog_category_product</item>
+                <item name="1" xsi:type="string">catalog_product_category</item>
+            </data>
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsOnStorefront" />
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportedProducts" />
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
@@ -61,6 +69,10 @@
             <data name="import/data/import_file/template/count" xsi:type="string">7</data>
             <data name="import/data/import_file/template/entities" xsi:type="string">7</data>
             <data name="import/data/import_file/entities/0" xsi:type="string">catalogProductSimple::default_in_custom_website</data>
+            <data name="indexerType" xsi:type="array">
+                <item name="0" xsi:type="string">catalog_category_product</item>
+                <item name="1" xsi:type="string">catalog_product_category</item>
+            </data>
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsOnStorefront" />
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportedProducts" />
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />

dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/etc/testcase.xml

@@ -11,6 +11,7 @@
         <step name="fillImportForm" module="Magento_ImportExport" next="clickCheckData" />
         <step name="clickCheckData" module="Magento_ImportExport" next="checkResultMessage" />
         <step name="checkResultMessage" module="Magento_ImportExport" next="clickImportData" />
-        <step name="clickImportData" module="Magento_ImportExport" />
+        <step name="clickImportData" module="Magento_ImportExport" next="reindex"/>
+        <step name="reindex" module="Magento_Indexer"/>
     </scenario>
 </config>

dev/tests/functional/tests/app/Magento/Indexer/Test/TestStep/ReindexStep.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Indexer\Test\TestStep;
+
+use Magento\Mtf\Util\Command\Cli\Indexer;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Run reindex process step.
+ */
+class ReindexStep implements TestStepInterface
+{
+    /**
+     * @var Indexer
+     */
+    private $indexer;
+
+    /**
+     * List of indexers to reindex
+     *
+     * @var array
+     */
+    private $indexerType;
+
+    /**
+     * @param Indexer $indexer
+     * @param array $indexerType
+     */
+    public function __construct(
+        Indexer $indexer,
+        array $indexerType = []
+    ) {
+        $this->indexer = $indexer;
+        $this->indexerType = $indexerType;
+    }
+
+    /**
+     * Run reindex process.
+     * All indexers will be refreshed in a case of empty $indexerType array.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->indexer->reindex($this->indexerType);
+    }
+}