Skip to content

Commit 0f30611

Browse files
authored
Merge pull request #323 from magento-commerce/suite-hotfix
Suite hotfix
2 parents 518bfbc + 00e1508 commit 0f30611

File tree

7 files changed

+35
-10
lines changed

7 files changed

+35
-10
lines changed

Diff for: CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
4.3.4
5+
---------
6+
### Fixes
7+
* Resolving an issue when test is marked as failed due to Suite after section failure
8+
49
4.3.3
510
---------
611
### Enhancements

Diff for: composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "4.3.3",
5+
"version": "4.3.4",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

Diff for: composer.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dev/tests/verification/Resources/ActionsInDifferentModulesSuite.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,13 @@ class ActionsInDifferentModulesSuite extends \Codeception\GroupObject
196196
);
197197
$availableSessions = RemoteWebDriver::getAllSessions($wdHost);
198198
foreach ($availableSessions as $session) {
199-
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
200-
$remoteWebDriver->quit();
199+
try {
200+
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
201+
$remoteWebDriver->quit();
202+
} catch (\Exception $exception) {
203+
print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
204+
// Session already closed so nothing to do
205+
}
201206
}
202207
}
203208
}

Diff for: dev/tests/verification/Resources/functionalSuiteHooks.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,13 @@ class functionalSuiteHooks extends \Codeception\GroupObject
179179
);
180180
$availableSessions = RemoteWebDriver::getAllSessions($wdHost);
181181
foreach ($availableSessions as $session) {
182-
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
183-
$remoteWebDriver->quit();
182+
try {
183+
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
184+
$remoteWebDriver->quit();
185+
} catch (\Exception $exception) {
186+
print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
187+
// Session already closed so nothing to do
188+
}
184189
}
185190
}
186191
}

Diff for: dev/tests/verification/Resources/functionalSuiteWithComments.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,13 @@ class functionalSuiteWithComments extends \Codeception\GroupObject
159159
);
160160
$availableSessions = RemoteWebDriver::getAllSessions($wdHost);
161161
foreach ($availableSessions as $session) {
162-
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
163-
$remoteWebDriver->quit();
162+
try {
163+
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
164+
$remoteWebDriver->quit();
165+
} catch (\Exception $exception) {
166+
print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
167+
// Session already closed so nothing to do
168+
}
164169
}
165170
}
166171
}

Diff for: src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache

+7-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,13 @@ class {{suiteName}} extends \Codeception\GroupObject
152152
);
153153
$availableSessions = RemoteWebDriver::getAllSessions($wdHost);
154154
foreach ($availableSessions as $session) {
155-
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
156-
$remoteWebDriver->quit();
155+
try {
156+
$remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
157+
$remoteWebDriver->quit();
158+
} catch (\Exception $exception) {
159+
print("Failed trying to quit WebDriver session. Exception message: " . $exception->getMessage() . " Test execution will continue." . PHP_EOL);
160+
// Session already closed so nothing to do
161+
}
157162
}
158163
}
159164
}

0 commit comments

Comments
 (0)