Skip to content

Commit 7632b1c

Browse files
authored
Merge pull request magento#1403 from magento-nord/MAGETWO-71431
Fixed issue: MAGETWO-71431 ImportProductsTest random failures
2 parents 5432781 + 42ae5e5 commit 7632b1c

File tree

3 files changed

+64
-1
lines changed

3 files changed

+64
-1
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
</item>
3030
</item>
3131
</data>
32+
<data name="indexerType" xsi:type="array">
33+
<item name="0" xsi:type="string">catalog_category_product</item>
34+
<item name="1" xsi:type="string">catalog_product_category</item>
35+
</data>
3236
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsOnStorefront" />
3337
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportedProducts" />
3438
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
@@ -45,6 +49,10 @@
4549
<data name="import/data/import_file/template/entities" xsi:type="string">4</data>
4650
<data name="import/data/import_file/entities/0" xsi:type="string">catalogProductSimple::default_in_custom_website</data>
4751
<data name="import/data/import_file/entities/1" xsi:type="string">catalogProductSimple::default</data>
52+
<data name="indexerType" xsi:type="array">
53+
<item name="0" xsi:type="string">catalog_category_product</item>
54+
<item name="1" xsi:type="string">catalog_product_category</item>
55+
</data>
4856
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsOnStorefront" />
4957
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportedProducts" />
5058
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
@@ -61,6 +69,10 @@
6169
<data name="import/data/import_file/template/count" xsi:type="string">7</data>
6270
<data name="import/data/import_file/template/entities" xsi:type="string">7</data>
6371
<data name="import/data/import_file/entities/0" xsi:type="string">catalogProductSimple::default_in_custom_website</data>
72+
<data name="indexerType" xsi:type="array">
73+
<item name="0" xsi:type="string">catalog_category_product</item>
74+
<item name="1" xsi:type="string">catalog_product_category</item>
75+
</data>
6476
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsOnStorefront" />
6577
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportedProducts" />
6678
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<step name="fillImportForm" module="Magento_ImportExport" next="clickCheckData" />
1212
<step name="clickCheckData" module="Magento_ImportExport" next="checkResultMessage" />
1313
<step name="checkResultMessage" module="Magento_ImportExport" next="clickImportData" />
14-
<step name="clickImportData" module="Magento_ImportExport" />
14+
<step name="clickImportData" module="Magento_ImportExport" next="reindex"/>
15+
<step name="reindex" module="Magento_Indexer"/>
1516
</scenario>
1617
</config>
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Indexer\Test\TestStep;
7+
8+
use Magento\Mtf\Util\Command\Cli\Indexer;
9+
use Magento\Mtf\TestStep\TestStepInterface;
10+
11+
/**
12+
* Run reindex process step.
13+
*/
14+
class ReindexStep implements TestStepInterface
15+
{
16+
/**
17+
* @var Indexer
18+
*/
19+
private $indexer;
20+
21+
/**
22+
* List of indexers to reindex
23+
*
24+
* @var array
25+
*/
26+
private $indexerType;
27+
28+
/**
29+
* @param Indexer $indexer
30+
* @param array $indexerType
31+
*/
32+
public function __construct(
33+
Indexer $indexer,
34+
array $indexerType = []
35+
) {
36+
$this->indexer = $indexer;
37+
$this->indexerType = $indexerType;
38+
}
39+
40+
/**
41+
* Run reindex process.
42+
* All indexers will be refreshed in a case of empty $indexerType array.
43+
*
44+
* @return void
45+
*/
46+
public function run()
47+
{
48+
$this->indexer->reindex($this->indexerType);
49+
}
50+
}

0 commit comments

Comments
 (0)