AC-6720::Cloud Native S3 Web API test Failures -2.4-develop - Removed Shared Instance for DeploymentConfig

rimple-saini · rimple-saini · commit 23c8c29c92d1 · 2022-10-18T22:34:40.000+05:30
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -263,7 +263,6 @@ protected function runTest()
             $resetConfig = $this->resetAddedSection($initialConfig, $currentConfig, $cacheSaltPathChunks);
             $resetFileContents = $this->formatter->format($resetConfig);
             $directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG);
-            sleep(20);
             $directoryWrite->writeFile($this->envConfigPath, $resetFileContents);
         }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlCache/CacheIdFactorProviders/Store/CurrencyProviderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlCache/CacheIdFactorProviders/Store/CurrencyProviderTest.php
@@ -14,6 +14,11 @@
  */
 class CurrencyProviderTest extends GraphQlAbstract
 {
+    protected function setUp() :void
+    {
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->removeSharedInstance(\Magento\Framework\App\DeploymentConfig::class);
+    }
     /**
      * Tests that the cache id header changes based on the currency and remains consistent for the same currency.
      *

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ protected function runTest()`
`263`	`263`	`$resetConfig = $this->resetAddedSection($initialConfig, $currentConfig, $cacheSaltPathChunks);`
`264`	`264`	`$resetFileContents = $this->formatter->format($resetConfig);`
`265`	`265`	`$directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG);`
`266`		`- sleep(20);`
`267`	`266`	`$directoryWrite->writeFile($this->envConfigPath, $resetFileContents);`
`268`	`267`	`}`
`269`	`268`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@`
`14`	`14`	`*/`
`15`	`15`	`class CurrencyProviderTest extends GraphQlAbstract`
`16`	`16`	`{`
	`17`	`+ protected function setUp() :void`
	`18`	`+ {`
	`19`	`+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()`
	`20`	`+ ->removeSharedInstance(\Magento\Framework\App\DeploymentConfig::class);`
	`21`	`+ }`
`17`	`22`	`/**`
`18`	`23`	`* Tests that the cache id header changes based on the currency and remains consistent for the same currency.`
`19`	`24`	`*`