MAGECLOUD-2501: Review cron:unlock Command Compatibility with MAGECLOUD-2445 Changes (#351)

* MAGECLOUD-2501: Review cron:unlock Command Compatibility with MAGECLOUD-2445 Changes

Author: Bohdan Korablov

src/App/Container.php

@@ -229,6 +229,7 @@ function () {
                     'processes' => [
                         $this->container->make(DeployProcess\PreDeploy::class),
                         $this->container->make(DeployProcess\DisableCron::class),
+                        $this->container->make(DeployProcess\UnlockCronJobs::class),
                         $this->container->make(\Magento\MagentoCloud\Process\ValidateConfiguration::class, [
                             'validators' => [
                                 ValidatorInterface::LEVEL_CRITICAL => [
@@ -253,7 +254,6 @@ function () {
                         $this->container->make(DeployProcess\DeployStaticContent::class),
                         $this->container->make(DeployProcess\CompressStaticContent::class),
                         $this->container->make(DeployProcess\DisableGoogleAnalytics::class),
-                        $this->container->make(DeployProcess\UnlockCronJobs::class),
                         $this->container->make(DeployProcess\EnableCron::class),
 
                         /**

src/Process/Deploy/UnlockCronJobs.php

@@ -6,6 +6,7 @@
 namespace Magento\MagentoCloud\Process\Deploy;
 
 use Magento\MagentoCloud\Cron\JobUnlocker;
+use Magento\MagentoCloud\Package\MagentoVersion;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Psr\Log\LoggerInterface;
 
@@ -28,16 +29,24 @@ class UnlockCronJobs implements ProcessInterface
      */
     private $jobUnlocker;
 
+    /**
+     * @var MagentoVersion
+     */
+    private $magentoVersion;
+
     /**
      * @param JobUnlocker $jobUnlocker
      * @param LoggerInterface $logger
+     * @param MagentoVersion $version
      */
     public function __construct(
         JobUnlocker $jobUnlocker,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        MagentoVersion $version
     ) {
         $this->jobUnlocker = $jobUnlocker;
         $this->logger = $logger;
+        $this->magentoVersion = $version;
     }
 
     /**
@@ -47,6 +56,13 @@ public function __construct(
      */
     public function execute()
     {
+        /**
+         * Since version 2.2.2 Magento unlocks cron jobs during upgrade
+         */
+        if ($this->magentoVersion->isGreaterOrEqual('2.2.2')) {
+            return;
+        }
+
         $updatedJobsCount = $this->jobUnlocker->unlockAll();
 
         if ($updatedJobsCount) {

src/Test/Unit/Process/Deploy/UnlockCronJobsTest.php

@@ -6,6 +6,7 @@
 namespace Magento\MagentoCloud\Test\Unit\Process\Deploy;
 
 use Magento\MagentoCloud\Cron\JobUnlocker;
+use Magento\MagentoCloud\Package\MagentoVersion;
 use Magento\MagentoCloud\Process\Deploy\UnlockCronJobs;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -26,6 +27,11 @@ class UnlockCronJobsTest extends TestCase
      */
     private $jobUnlockerMock;
 
+    /**
+     * @var MagentoVersion|MockObject
+     */
+    private $magentoVersionMock;
+
     /**
      * @var UnlockCronJobs
      */
@@ -38,15 +44,19 @@ protected function setUp()
     {
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->jobUnlockerMock = $this->createMock(JobUnlocker::class);
+        $this->magentoVersionMock = $this->createMock(MagentoVersion::class);
 
         $this->process = new UnlockCronJobs(
             $this->jobUnlockerMock,
-            $this->loggerMock
+            $this->loggerMock,
+            $this->magentoVersionMock
         );
     }
 
     public function testExecute()
     {
+        $this->magentoVersionMock->method('isGreaterOrEqual')
+            ->willReturn(false);
         $this->jobUnlockerMock->expects($this->once())
             ->method('unlockAll')
             ->willReturn(5);
@@ -59,6 +69,8 @@ public function testExecute()
 
     public function testExecuteNoJobsUpdated()
     {
+        $this->magentoVersionMock->method('isGreaterOrEqual')
+            ->willReturn(false);
         $this->jobUnlockerMock->expects($this->once())
             ->method('unlockAll')
             ->willReturn(0);
@@ -67,4 +79,16 @@ public function testExecuteNoJobsUpdated()
 
         $this->process->execute();
     }
+
+    public function testSkipExecute()
+    {
+        $this->magentoVersionMock->expects($this->once())
+            ->method('isGreaterOrEqual')
+            ->with('2.2.2')
+            ->willReturn(true);
+        $this->jobUnlockerMock->expects($this->never())
+            ->method('unlockAll');
+
+        $this->process->execute();
+    }
 }