Skip to content

Commit ab8ef42

Browse files
committed
AC-15248-V2: Fix Integration Test
1 parent e5b45de commit ab8ef42

File tree

1 file changed

+7
-0
lines changed
  • dev/tests/integration/framework/Magento/TestFramework/Annotation

1 file changed

+7
-0
lines changed

dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ public function __construct(Application $application)
5050
protected function _isolateApp()
5151
{
5252
if ($this->hasNonIsolatedTests) {
53+
// Clear fixture resolver state before app reinitialization
54+
try {
55+
$resolver = \Magento\TestFramework\Workaround\Override\Fixture\Resolver::getInstance();
56+
$resolver->setCurrentTest(null);
57+
} catch (\RuntimeException $e) {
58+
// Resolver not initialized yet, ignore
59+
}
5360
$this->application->reinitialize();
5461
$_SESSION = [];
5562
$_COOKIE = [];

0 commit comments

Comments
 (0)