Skip to content

Commit 244c6d4

Browse files
committed
MQE-2094: Test failure re-run error for extn builds
1 parent a8aa239 commit 244c6d4

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,7 @@ private function getFailedTestList()
165165
if ($suiteName == self::DEFAULT_TEST_GROUP) {
166166
array_push($failedTestDetails['tests'], $testName);
167167
} else {
168-
// Trim potential suite_parallel_0_G to suite_parallel
169-
$suiteNameArray = explode("_", $suiteName);
170-
if (array_pop($suiteNameArray) === 'G') {
171-
if (is_numeric(array_pop($suiteNameArray))) {
172-
$suiteName = implode("_", $suiteNameArray);
173-
}
174-
}
168+
$suiteName = $this->sanitizeSuiteName($suiteName);
175169
$failedTestDetails['suites'] = array_merge_recursive(
176170
$failedTestDetails['suites'],
177171
[$suiteName => [$testName]]
@@ -193,6 +187,23 @@ private function getFailedTestList()
193187
return $testConfigurationJson;
194188
}
195189

190+
/**
191+
* Trim potential suite_parallel_0_G to suite_parallel
192+
*
193+
* @param string $suiteName
194+
* @return string
195+
*/
196+
private function sanitizeSuiteName($suiteName)
197+
{
198+
$suiteNameArray = explode("_", $suiteName);
199+
if(array_pop($suiteNameArray) == 'G') {
200+
if (is_numeric(array_pop($suiteNameArray))) {
201+
$suiteName = implode("_", $suiteNameArray);
202+
}
203+
}
204+
return $suiteName;
205+
}
206+
196207
/**
197208
* Returns an array of run commands read from the manifest file created post generation
198209
*

0 commit comments

Comments
 (0)