MC-5926: Conflict of simultaneous write in Redis cache

- integration test to switch from dev to production mode regardless if the integration test framework works in developer or production mode

Author: cpartica

dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php

@@ -78,15 +78,17 @@ protected function setUp()
         $this->prevMode = $this->objectManager->get(State::class)->getMode();
         $this->filesystem = $this->objectManager->get(Filesystem::class);
 
-        $this->config = $this->loadConfig();
-        $this->envConfig = $this->loadEnvConfig();
+        // Load the original config to restore it on teardown
+        $this->config = $this->reader->load(ConfigFilePool::APP_CONFIG);
+        $this->envConfig = $this->reader->load(ConfigFilePool::APP_ENV);
     }
 
     /**
      * @inheritdoc
      */
     public function tearDown()
     {
+        // Restore the original config
         $this->writer->saveConfig([ConfigFilePool::APP_CONFIG => $this->config]);
         $this->writer->saveConfig([ConfigFilePool::APP_ENV => $this->envConfig]);
 
@@ -128,9 +130,14 @@ public function testSwitchMode()
         }
     }
 
+    /**
+     * Enable production mode
+     *
+     * @return void
+     */
     private function enableAndAssertProductionMode()
     {
-        // enable production mode
+        // Enable production mode
         $this->clearStaticFiles();
         $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
         $this->commandTester->execute(
@@ -149,7 +156,9 @@ private function enableAndAssertProductionMode()
     }
 
     /**
-     * Enable
+     * Enable developer mode
+     *
+     * @return void
      */
     private function enableAndAssertDeveloperMode()
     {
@@ -199,20 +208,4 @@ function ($output) use ($objectManager) {
 
         return $deployStaticContentCommand;
     }
-
-    /**
-     * @return array
-     */
-    private function loadConfig()
-    {
-        return $this->reader->load(ConfigFilePool::APP_CONFIG);
-    }
-
-    /**
-     * @return array
-     */
-    private function loadEnvConfig()
-    {
-        return $this->reader->load(ConfigFilePool::APP_ENV);
-    }
 }