Merge pull request #259 from magento/2.3.9

Merge MFTF 2.3.9 into develop

Author: KevinBKozan

CHANGELOG.md

@@ -1,5 +1,9 @@
 Magento Functional Testing Framework Changelog
 ================================================
+2.3.9
+-----
+### Fixes
+* Logic for parallel execution were updated to split default tests and suites from running in one group.
 
 2.3.8
 -----

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.3.8",
+    "version": "2.3.9",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -98,13 +98,14 @@ public function testSortWithSuites()
         $actualResult = $testSorter->getTestsGroupedBySize($sampleSuiteArray, $sampleTestArray, 500);
 
         // verify the resulting groups
-        $this->assertCount(4, $actualResult);
+        $this->assertCount(5, $actualResult);
 
         $expectedResults =  [
-            1 => ['test3'],
-            2 => ['test2','test5', 'test4'],
-            3 => ['mockSuite1_0', 'test1'],
-            4 => ['mockSuite1_1']
+            1 => ['mockSuite1_0'],
+            2 => ['mockSuite1_1'],
+            3 => ['test3'],
+            4 => ['test2','test5', 'test4'],
+            5 => ['test1'],
         ];
 
         foreach ($actualResult as $groupNum => $group) {

dev/tests/unit/Magento/FunctionalTestFramework/Util/Sorter/ParallelGroupSorterTest.php

@@ -47,12 +47,18 @@ public function getTestsGroupedBySize($suiteConfiguration, $testNameToSize, $tim
         $testGroups = [];
         $splitSuiteNamesToTests = $this->createGroupsWithinSuites($suiteConfiguration, $time);
         $splitSuiteNamesToSize = $this->getSuiteToSize($splitSuiteNamesToTests);
-        $entriesForGeneration = array_merge($testNameToSize, $splitSuiteNamesToSize);
-        arsort($entriesForGeneration);
+        arsort($testNameToSize);
+        arsort($splitSuiteNamesToSize);
 
-        $testNameToSizeForUse = $entriesForGeneration;
+        $testNameToSizeForUse = $testNameToSize;
         $nodeNumber = 1;
-        foreach ($entriesForGeneration as $testName => $testSize) {
+
+        foreach ($splitSuiteNamesToSize as $testName => $testSize) {
+            $testGroups[$nodeNumber] = [$testName => $testSize];
+            $nodeNumber++;
+        }
+
+        foreach ($testNameToSize as $testName => $testSize) {
             if (!array_key_exists($testName, $testNameToSizeForUse)) {
                 // skip tests which have already been added to a group
                 continue;