Skip to content

Commit 0c54531

Browse files
committed
Fix mftf tests
1 parent 540d761 commit 0c54531

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<requiredEntity createDataKey="fixedBundleOption"/>
4040
<requiredEntity createDataKey="createSimpleProductTwo"/>
4141
</createData>
42-
<magentoCLI command="indexer:reindex" arguments="cataloginventory_stock catalogsearch_fulltext" stepKey="reindex"/>
42+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
4343
</before>
4444
<after>
4545
<deleteData createDataKey="createDynamicBundle" stepKey="deleteDynamicBundleProduct"/>

dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,17 @@ public static function setUpBeforeClass()
4545
} else {
4646
//get current minor branch name
4747
preg_match('|^(\d+\.\d+)|', $branchName, $minorBranch);
48-
$branchName = $minorBranch[0];
48+
if (isset($minorBranch[0])) {
49+
$branchName = $minorBranch[0];
4950

50-
//get all version branches
51-
preg_match_all('|^(\d+\.\d+)|m', file_get_contents($branchesFile), $matches);
51+
//get all version branches
52+
preg_match_all('|^(\d+\.\d+)|m', file_get_contents($branchesFile), $matches);
5253

53-
//check is this a latest release branch
54-
self::$actualBranch = ($branchName == max($matches[0]));
54+
//check is this a latest release branch
55+
self::$actualBranch = ($branchName == max($matches[0]));
56+
} else {
57+
self::$actualBranch = true;
58+
}
5559
}
5660
}
5761

0 commit comments

Comments
 (0)