#12497 Prevent running again already running cron group

kandy · kandy · commit 79d60cb6473c · 2018-03-25T18:52:57.000Z
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -8,6 +8,8 @@
 use Magento\Cron\Model\Schedule;
 use Magento\Cron\Observer\ProcessCronQueueObserver as ProcessCronQueueObserver;
 use Magento\Framework\App\State;
+use Magento\Framework\Profiler\Driver\Standard\StatFactory;
+use Magento\Framework\Profiler\Driver\Standard\Stat;
 
 /**
  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
@@ -121,6 +123,7 @@ protected function setUp()
         )->disableOriginalConstructor()->getMock();
         $this->_collection->expects($this->any())->method('addFieldToFilter')->will($this->returnSelf());
         $this->_collection->expects($this->any())->method('load')->will($this->returnSelf());
+
         $this->_scheduleFactory = $this->getMockBuilder(
             \Magento\Cron\Model\ScheduleFactory::class
         )->setMethods(
@@ -170,6 +173,15 @@ protected function setUp()
         $this->scheduleResource->method('getConnection')->willReturn($connection);
         $connection->method('delete')->willReturn(1);
 
+        $this->statFactory = $this->getMockBuilder(StatFactory::class)
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+
+        $this->stat = $this->getMockBuilder(\Magento\Framework\Profiler\Driver\Standard\Stat::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statFactory->expects($this->any())->method('create')->willReturn($this->stat);
+
         $this->_observer = new ProcessCronQueueObserver(
             $this->_objectManager,
             $this->_scheduleFactory,
@@ -182,58 +194,38 @@ protected function setUp()
             $phpExecutableFinderFactory,
             $this->loggerMock,
             $this->appStateMock,
+            $this->statFactory,
             $this->lockManagerMock
         );
     }
 
-    /**
-     * Test case without saved cron jobs in data base
-     */
-    public function testDispatchNoPendingJobs()
-    {
-        $lastRun = $this->time + 10000000;
-        $this->_cache->expects($this->any())->method('load')->will($this->returnValue($lastRun));
-        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
-
-        $this->_config->expects($this->once())->method('getJobs')->will($this->returnValue([]));
-
-        $scheduleMock = $this->getMockBuilder(
-            \Magento\Cron\Model\Schedule::class
-        )->disableOriginalConstructor()->getMock();
-        $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
-
-        $this->_observer->execute($this->observer);
-    }
-
     /**
      * Test case for not existed cron jobs in files but in data base is presented
      */
     public function testDispatchNoJobConfig()
     {
         $lastRun = $this->time + 10000000;
-        $this->_cache->expects($this->any())->method('load')->will($this->returnValue($lastRun));
-        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
+        $this->_cache->expects($this->atLeastOnce())->method('load')->will($this->returnValue($lastRun));
+        $this->_scopeConfig->expects($this->atLeastOnce())->method('getValue')->will($this->returnValue(0));
 
         $this->_config->expects(
-            $this->any()
+            $this->atLeastOnce()
         )->method(
             'getJobs'
         )->will(
             $this->returnValue(['test_job1' => ['test_data']])
         );
 
         $schedule = $this->createPartialMock(\Magento\Cron\Model\Schedule::class, ['getJobCode', '__wakeup']);
-        $schedule->expects($this->once())->method('getJobCode')->will($this->returnValue('not_existed_job_code'));
+        $schedule->expects($this->atLeastOnce())->method('getJobCode')->will($this->returnValue('not_existed_job_code'));
 
         $this->_collection->addItem($schedule);
 
         $scheduleMock = $this->getMockBuilder(
             \Magento\Cron\Model\Schedule::class
         )->disableOriginalConstructor()->getMock();
-        $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
-        $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->any())->method('create')->will($this->returnValue($scheduleMock));
+        $scheduleMock->expects($this->atLeastOnce())->method('getCollection')->will($this->returnValue($this->_collection));
+        $this->_scheduleFactory->expects($this->atLeastOnce())->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -252,11 +244,13 @@ public function testDispatchCanNotLock()
         $schedule = $this->getMockBuilder(
             \Magento\Cron\Model\Schedule::class
         )->setMethods(
-            ['getJobCode', 'tryLockJob', 'getScheduledAt', '__wakeup', 'save']
+            ['getJobCode', 'tryLockJob', 'getScheduledAt', '__wakeup', 'save', 'setFinishedAt']
         )->disableOriginalConstructor()->getMock();
         $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
-        $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
         $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(false));
+        $schedule->expects($this->never())->method('setFinishedAt');
+
         $abstractModel = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
         $schedule->expects($this->any())->method('save')->will($this->returnValue($abstractModel));
         $this->_collection->addItem($schedule);
@@ -274,7 +268,7 @@ public function testDispatchCanNotLock()
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->atLeastOnce())->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -284,7 +278,7 @@ public function testDispatchCanNotLock()
      */
     public function testDispatchExceptionTooLate()
     {
-        $exceptionMessage = 'Too late for the schedule';
+        $exceptionMessage = 'Cron Job test_job1 is missed at 2017-07-30 15:00:00';
         $scheduleId = 42;
         $jobCode = 'test_job1';
         $exception = $exceptionMessage . ' Schedule Id: ' . $scheduleId . ' Job Code: ' . $jobCode;
@@ -311,25 +305,25 @@ public function testDispatchExceptionTooLate()
                 'getScheduleId',
             ]
         )->disableOriginalConstructor()->getMock();
-        $schedule->expects($this->any())->method('getJobCode')->willReturn($jobCode);
-        $schedule->expects($this->once())->method('getScheduledAt')->willReturn($dateScheduledAt);
+        $schedule->expects($this->atLeastOnce())->method('getJobCode')->willReturn($jobCode);
+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->willReturn($dateScheduledAt);
         $schedule->expects($this->once())->method('tryLockJob')->willReturn(true);
         $schedule->expects(
-            $this->once()
+            $this->any()
         )->method(
             'setStatus'
         )->with(
             $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_MISSED)
         )->willReturnSelf();
         $schedule->expects($this->once())->method('setMessages')->with($this->equalTo($exceptionMessage));
-        $schedule->expects($this->any())->method('getStatus')->willReturn(Schedule::STATUS_MISSED);
-        $schedule->expects($this->once())->method('getMessages')->willReturn($exceptionMessage);
-        $schedule->expects($this->once())->method('getScheduleId')->willReturn($scheduleId);
+        $schedule->expects($this->atLeastOnce())->method('getStatus')->willReturn(Schedule::STATUS_MISSED);
+        $schedule->expects($this->atLeastOnce())->method('getMessages')->willReturn($exceptionMessage);
         $schedule->expects($this->once())->method('save');
 
         $this->appStateMock->expects($this->once())->method('getMode')->willReturn(State::MODE_DEVELOPER);
 
-        $this->loggerMock->expects($this->once())->method('info')->with($exception);
+        $this->loggerMock->expects($this->once())->method('info')
+            ->with('Cron Job test_job1 is missed at 2017-07-30 15:00:00');
 
         $this->_collection->addItem($schedule);
 
@@ -345,7 +339,7 @@ public function testDispatchExceptionTooLate()
             ->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->willReturn($this->_collection);
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->willReturn($scheduleMock);
+        $this->_scheduleFactory->expects($this->atLeastOnce())->method('create')->willReturn($scheduleMock);
 
         $this->_observer->execute($this->observer);
     }
@@ -400,7 +394,7 @@ public function testDispatchExceptionNoCallback()
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -465,7 +459,7 @@ public function testDispatchExceptionInCallback(
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->once())->method('create')->will($this->returnValue($scheduleMock));
         $this->_objectManager
             ->expects($this->once())
             ->method('create')
@@ -541,23 +535,22 @@ public function testDispatchRunJob()
             $scheduleMethods
         )->disableOriginalConstructor()->getMock();
         $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
-        $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-        $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(true));
+        $schedule->expects($this->atLeastOnce())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
+        $schedule->expects($this->atLeastOnce())->method('tryLockJob')->will($this->returnValue(true));
+        $schedule->expects($this->any())->method('setFinishedAt')->willReturnSelf();
 
         // cron start to execute some job
         $schedule->expects($this->any())->method('setExecutedAt')->will($this->returnSelf());
-        $schedule->expects($this->at(5))->method('save');
+        $schedule->expects($this->atLeastOnce())->method('save');
 
         // cron end execute some job
         $schedule->expects(
-            $this->at(6)
+            $this->atLeastOnce()
         )->method(
             'setStatus'
         )->with(
             $this->equalTo(\Magento\Cron\Model\Schedule::STATUS_SUCCESS)
-        )->will(
-            $this->returnSelf()
-        );
+        )->willReturnSelf();
 
         $schedule->expects($this->at(8))->method('save');
 
@@ -576,7 +569,7 @@ public function testDispatchRunJob()
         )->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($this->_collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->exactly(2))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->once(2))->method('create')->will($this->returnValue($scheduleMock));
 
         $testCronJob = $this->getMockBuilder('CronJob')->setMethods(['execute'])->getMock();
         $testCronJob->expects($this->atLeastOnce())->method('execute')->with($schedule);
@@ -783,7 +776,7 @@ public function testDispatchCleanup()
         )->setMethods(['getCollection', 'getResource'])->disableOriginalConstructor()->getMock();
         $scheduleMock->expects($this->any())->method('getCollection')->will($this->returnValue($collection));
         $scheduleMock->expects($this->any())->method('getResource')->will($this->returnValue($this->scheduleResource));
-        $this->_scheduleFactory->expects($this->at(1))->method('create')->will($this->returnValue($scheduleMock));
+        $this->_scheduleFactory->expects($this->any())->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->execute($this->observer);
     }
@@ -807,55 +800,17 @@ public function testMissedJobsCleanedInTime()
         $this->_cache->expects($this->at(2))->method('load')->will($this->returnValue($this->time + 10000000));
         $this->_scheduleFactory->expects($this->at(2))->method('create')->will($this->returnValue($scheduleMock));
 
-        // This item was scheduled 2 days and 2 hours ago
-        $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 180000);
-        /** @var \Magento\Cron\Model\Schedule|\PHPUnit_Framework_MockObject_MockObject $schedule1 */
-        $schedule1 = $this->getMockBuilder(
-            \Magento\Cron\Model\Schedule::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getExecutedAt', 'getScheduledAt', 'getStatus', 'delete', '__wakeup']
-        )->getMock();
-        $schedule1->expects($this->any())->method('getExecutedAt')->will($this->returnValue(null));
-        $schedule1->expects($this->any())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-        $schedule1->expects($this->any())->method('getStatus')->will($this->returnValue(Schedule::STATUS_MISSED));
-        //we expect this job be deleted from the list
-        $schedule1->expects($this->once())->method('delete')->will($this->returnValue(true));
-        $this->_collection->addItem($schedule1);
-
-        // This item was scheduled 1 day ago
-        $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
-        $schedule2 = $this->getMockBuilder(
-            \Magento\Cron\Model\Schedule::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getExecutedAt', 'getScheduledAt', 'getStatus', 'delete', '__wakeup']
-        )->getMock();
-        $schedule2->expects($this->any())->method('getExecutedAt')->will($this->returnValue(null));
-        $schedule2->expects($this->any())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
-        $schedule2->expects($this->any())->method('getStatus')->will($this->returnValue(Schedule::STATUS_MISSED));
-        //we don't expect this job be deleted from the list
-        $schedule2->expects($this->never())->method('delete');
-        $this->_collection->addItem($schedule2);
-
         $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
 
-        $this->_scopeConfig->expects($this->at(0))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/use_separate_process'))
-            ->will($this->returnValue(0));
-        $this->_scopeConfig->expects($this->at(1))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/history_cleanup_every'))
-            ->will($this->returnValue(10));
-        $this->_scopeConfig->expects($this->at(2))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/schedule_lifetime'))
-            ->will($this->returnValue(2*24*60));
-        $this->_scopeConfig->expects($this->at(3))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/history_success_lifetime'))
-            ->will($this->returnValue(0));
-        $this->_scopeConfig->expects($this->at(4))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/history_failure_lifetime'))
-            ->will($this->returnValue(0));
-        $this->_scopeConfig->expects($this->at(5))->method('getValue')
-            ->with($this->equalTo('system/cron/test_group/schedule_generate_every'))
-            ->will($this->returnValue(0));
+        $this->_scopeConfig->expects($this->any())->method('getValue')
+            ->willReturnMap([
+                ['system/cron/test_group/use_separate_process', 0],
+                ['system/cron/test_group/history_cleanup_every', 10],
+                ['system/cron/test_group/schedule_lifetime', 2*24*60],
+                ['system/cron/test_group/history_success_lifetime', 0],
+                ['system/cron/test_group/history_failure_lifetime', 0],
+                ['system/cron/test_group/schedule_generate_every', 0],
+            ]);
 
         $this->_collection->expects($this->any())->method('addFieldToFilter')->will($this->returnSelf());
         $this->_collection->expects($this->any())->method('load')->will($this->returnSelf());
