MC-5926: Conflict of simultaneous write in Redis cache

- fix integration test

Author: cpartica

dev/tests/integration/framework/Magento/TestFramework/App/Shell.php

@@ -10,6 +10,8 @@
 class Shell extends \Magento\Framework\App\Shell
 {
     /**
+     * Override app/shell by running bin/magento located in the integration test and pass environment parameters
+     *
      * @inheritdoc
      */
     public function execute($command, array $arguments = [])

dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php

@@ -58,6 +58,10 @@ public function startTestSuite()
     public function endTest(\PHPUnit\Framework\TestCase $test)
     {
         $config = $this->reader->load();
+        // ignore compiled_config setting because is not set in default mode
+        if (isset($config['cache_types']['compiled_config'])) {
+            unset($config['cache_types']['compiled_config']);
+        }
         if ($this->config != $config) {
             $error = "\n\nERROR: deployment configuration is corrupted. The application state is no longer valid.\n"
                 . 'Further tests may fail.'

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

@@ -94,6 +94,14 @@ public function tearDown()
         $this->writer->saveConfig([ConfigFilePool::APP_ENV => $this->envConfig]);
 
         $this->clearStaticFiles();
+        // enable default mode
+        $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+        $this->commandTester->execute(
+            ['mode' => 'default']
+        );
+        $commandOutput = $this->commandTester->getDisplay();
+        $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode());
+        $this->assertContains('Enabled default mode', $commandOutput);
     }
 
     /**
@@ -111,23 +119,11 @@ public function testSwitchMode()
     {
         if ($this->prevMode === 'production') {
             //in production mode, so we have to switch to dev, then to production
-            $this->clearStaticFiles();
             $this->enableAndAssertDeveloperMode();
             $this->enableAndAssertProductionMode();
         } else {
             //already in non production mode
-            //$this->clearStaticFiles();
             $this->enableAndAssertProductionMode();
-
-            // enable previous mode
-            $this->clearStaticFiles();
-            $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
-            $this->commandTester->execute(
-                ['mode' => $this->prevMode]
-            );
-            $commandOutput = $this->commandTester->getDisplay();
-            $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode());
-            $this->assertContains('Enabled ' . $this->prevMode . ' mode', $commandOutput);
         }
     }
 
@@ -139,7 +135,6 @@ public function testSwitchMode()
     private function enableAndAssertProductionMode()
     {
         // Enable production mode
-        $this->clearStaticFiles();
         $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
         $this->commandTester->execute(
             ['mode' => 'production']