MC-5926: Conflict of simultaneous write in Redis cache

- fix tests

Author: cpartica

app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php

@@ -116,17 +116,22 @@ public function testRegenerateStatic()
         $this->storeView->method('retrieveLocales')
             ->willReturn($storeLocales);
 
-        $setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
+        $setupDiCompileCmd = $this->cmdPrefix . 'cache:flush ';
         $this->shell->expects(self::at(0))
             ->method('execute')
             ->with($setupDiCompileCmd);
 
+        $setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
+        $this->shell->expects(self::at(1))
+            ->method('execute')
+            ->with($setupDiCompileCmd);
+
         $this->initAdminLocaleMock('en_US');
 
         $usedLocales = ['fr_FR', 'de_DE', 'nl_NL', 'en_US'];
         $staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
             . implode(' ', $usedLocales);
-        $this->shell->expects(self::at(1))
+        $this->shell->expects(self::at(2))
             ->method('execute')
             ->with($staticContentDeployCmd);
 

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

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\TestFramework\App;
+
 /**
  * Shell command line wrapper encapsulates command execution and arguments escaping
  */