ENGCOM-5582: Fix random fails during parallel SCD execution #22886

Author: sidolov

lib/internal/Magento/Framework/View/Asset/LockerProcess.php

@@ -62,7 +62,7 @@ public function __construct(Filesystem $filesystem)
      */
     public function lockProcess($lockName)
     {
-        if ($this->getState()->getMode() == State::MODE_PRODUCTION) {
+        if ($this->getState()->getMode() === State::MODE_PRODUCTION || PHP_SAPI === 'cli') {
             return;
         }
 
@@ -78,11 +78,12 @@ public function lockProcess($lockName)
 
     /**
      * @inheritdoc
+     *
      * @throws FileSystemException
      */
     public function unlockProcess()
     {
-        if ($this->getState()->getMode() == State::MODE_PRODUCTION) {
+        if ($this->getState()->getMode() === State::MODE_PRODUCTION || PHP_SAPI === 'cli') {
             return;
         }
 
@@ -115,9 +116,10 @@ private function isProcessLocked()
     }
 
     /**
-     * Get name of lock file
+     * Get path to lock file
      *
      * @param string $name
+     *
      * @return string
      */
     private function getFilePath($name)
@@ -126,7 +128,10 @@ private function getFilePath($name)
     }
 
     /**
+     * Get State object
+     *
      * @return State
+     *
      * @deprecated 100.1.1
      */
     private function getState()

lib/internal/Magento/Framework/View/Test/Unit/Asset/LockerProcessTest.php

@@ -64,24 +64,6 @@ protected function setUp()
         );
     }
 
-    /**
-     * Test for lockProcess method
-     *
-     * @param string $method
-     *
-     * @dataProvider dataProviderTestLockProcess
-     */
-    public function testLockProcess($method)
-    {
-        $this->stateMock->expects(self::once())->method('getMode')->willReturn(State::MODE_DEVELOPER);
-        $this->filesystemMock->expects(self::once())
-            ->method('getDirectoryWrite')
-            ->with(DirectoryList::VAR_DIR)
-            ->willReturn($this->$method());
-
-        $this->lockerProcess->lockProcess(self::LOCK_NAME);
-    }
-
     public function testNotLockProcessInProductionMode()
     {
         $this->stateMock->expects(self::once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
@@ -90,21 +72,6 @@ public function testNotLockProcessInProductionMode()
         $this->lockerProcess->lockProcess(self::LOCK_NAME);
     }
 
-    /**
-     * Test for unlockProcess method
-     */
-    public function testUnlockProcess()
-    {
-        $this->stateMock->expects(self::exactly(2))->method('getMode')->willReturn(State::MODE_DEVELOPER);
-        $this->filesystemMock->expects(self::once())
-            ->method('getDirectoryWrite')
-            ->with(DirectoryList::VAR_DIR)
-            ->willReturn($this->getTmpDirectoryMockFalse(1));
-
-        $this->lockerProcess->lockProcess(self::LOCK_NAME);
-        $this->lockerProcess->unlockProcess();
-    }
-
     public function testNotUnlockProcessInProductionMode()
     {
         $this->stateMock->expects(self::exactly(2))->method('getMode')->willReturn(State::MODE_PRODUCTION);
@@ -114,17 +81,6 @@ public function testNotUnlockProcessInProductionMode()
         $this->lockerProcess->unlockProcess();
     }
 
-    /**
-     * @return array
-     */
-    public function dataProviderTestLockProcess()
-    {
-        return [
-            ['method' => 'getTmpDirectoryMockTrue'],
-            ['method' => 'getTmpDirectoryMockFalse']
-        ];
-    }
-
     /**
      * @return WriteInterface|\PHPUnit_Framework_MockObject_MockObject
      */