Merge pull request #323 from magento-commerce/suite-hotfix

Suite hotfix
magento · Aug 15, 2023 · 0f30611 · 0f30611
2 parents 518bfbc + 00e1508
commit 0f30611
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+4.3.4
+---------
+### Fixes
+* Resolving an issue when test is marked as failed due to Suite after section failure
+
 4.3.3
 ---------
 ### Enhancements

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "4.3.3",
+    "version": "4.3.4",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/verification/Resources/ActionsInDifferentModulesSuite.txt b/dev/tests/verification/Resources/ActionsInDifferentModulesSuite.txt
@@ -196,8 +196,13 @@ class ActionsInDifferentModulesSuite extends \Codeception\GroupObject
             );
             $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
             foreach ($availableSessions as $session) {
-                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
-                $remoteWebDriver->quit();
+                try {
+                    $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                    $remoteWebDriver->quit();
+                } catch (\Exception $exception) {
+                    print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
+                    // Session already closed so nothing to do
+                }
             }
         }
     }

diff --git a/dev/tests/verification/Resources/functionalSuiteHooks.txt b/dev/tests/verification/Resources/functionalSuiteHooks.txt
@@ -179,8 +179,13 @@ class functionalSuiteHooks extends \Codeception\GroupObject
             );
             $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
             foreach ($availableSessions as $session) {
-                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
-                $remoteWebDriver->quit();
+                try {
+                    $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                    $remoteWebDriver->quit();
+                } catch (\Exception $exception) {
+                    print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
+                    // Session already closed so nothing to do
+                }
             }
         }
     }

diff --git a/dev/tests/verification/Resources/functionalSuiteWithComments.txt b/dev/tests/verification/Resources/functionalSuiteWithComments.txt
@@ -159,8 +159,13 @@ class functionalSuiteWithComments extends \Codeception\GroupObject
             );
             $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
             foreach ($availableSessions as $session) {
-                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
-                $remoteWebDriver->quit();
+                try {
+                    $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                    $remoteWebDriver->quit();
+                } catch (\Exception $exception) {
+                    print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
+                    // Session already closed so nothing to do
+                }
             }
         }
     }

diff --git a/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache b/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache
@@ -152,8 +152,13 @@ class {{suiteName}} extends \Codeception\GroupObject
             );
             $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
             foreach ($availableSessions as $session) {
-                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
-                $remoteWebDriver->quit();
+                try {
+                    $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                    $remoteWebDriver->quit();
+                } catch (\Exception $exception) {
+                    print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
+                    // Session already closed so nothing to do
+                }
             }
         }
     }