From a8aa239317c8449199e6c01ffc1351f8a829e861 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Wed, 22 Apr 2020 13:16:42 -0500 Subject: [PATCH 1/3] MQE-2094: Test failure re-run error for extn builds fixed group name --- .../Console/RunTestFailedCommand.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php b/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php index 5f0596a7f..754739dbc 100644 --- a/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php +++ b/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php @@ -165,10 +165,12 @@ private function getFailedTestList() if ($suiteName == self::DEFAULT_TEST_GROUP) { array_push($failedTestDetails['tests'], $testName); } else { - // Trim potential suite_parallel_0 to suite_parallel + // Trim potential suite_parallel_0_G to suite_parallel $suiteNameArray = explode("_", $suiteName); - if (is_numeric(array_pop($suiteNameArray))) { - $suiteName = implode("_", $suiteNameArray); + if (array_pop($suiteNameArray) === 'G') { + if (is_numeric(array_pop($suiteNameArray))) { + $suiteName = implode("_", $suiteNameArray); + } } $failedTestDetails['suites'] = array_merge_recursive( $failedTestDetails['suites'], From 244c6d4f40eca99d3c427d8cfb34a7189ea626b2 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Wed, 22 Apr 2020 13:41:21 -0500 Subject: [PATCH 2/3] MQE-2094: Test failure re-run error for extn builds --- .../Console/RunTestFailedCommand.php | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php b/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php index 754739dbc..1c5e70814 100644 --- a/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php +++ b/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php @@ -165,13 +165,7 @@ private function getFailedTestList() if ($suiteName == self::DEFAULT_TEST_GROUP) { array_push($failedTestDetails['tests'], $testName); } else { - // Trim potential suite_parallel_0_G to suite_parallel - $suiteNameArray = explode("_", $suiteName); - if (array_pop($suiteNameArray) === 'G') { - if (is_numeric(array_pop($suiteNameArray))) { - $suiteName = implode("_", $suiteNameArray); - } - } + $suiteName = $this->sanitizeSuiteName($suiteName); $failedTestDetails['suites'] = array_merge_recursive( $failedTestDetails['suites'], [$suiteName => [$testName]] @@ -193,6 +187,23 @@ private function getFailedTestList() return $testConfigurationJson; } + /** + * Trim potential suite_parallel_0_G to suite_parallel + * + * @param string $suiteName + * @return string + */ + private function sanitizeSuiteName($suiteName) + { + $suiteNameArray = explode("_", $suiteName); + if(array_pop($suiteNameArray) == 'G') { + if (is_numeric(array_pop($suiteNameArray))) { + $suiteName = implode("_", $suiteNameArray); + } + } + return $suiteName; + } + /** * Returns an array of run commands read from the manifest file created post generation * From e45c5e5f11c252ddc0437035f9262659c12fbebc Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Wed, 22 Apr 2020 13:52:11 -0500 Subject: [PATCH 3/3] MQE-2094: Test failure re-run error for extn builds --- .../FunctionalTestingFramework/Console/RunTestFailedCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php b/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php index 1c5e70814..c6a2d0b76 100644 --- a/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php +++ b/src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php @@ -196,7 +196,7 @@ private function getFailedTestList() private function sanitizeSuiteName($suiteName) { $suiteNameArray = explode("_", $suiteName); - if(array_pop($suiteNameArray) == 'G') { + if (array_pop($suiteNameArray) == 'G') { if (is_numeric(array_pop($suiteNameArray))) { $suiteName = implode("_", $suiteNameArray); }