MAGETWO-34526: Process GitHub PR#1052

Author: Eugene Tulika

app/code/Magento/Cron/Model/Observer.php

@@ -324,16 +324,18 @@ protected function _cleanup($groupId)
             'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_CLEANUP_EVERY,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
+
+        if ($lastCleanup > time() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
+            return $this;
+        }
+
+        // check how long the record should stay unprocessed before marked as MISSED
         $scheduleLifetime = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
 
-        if ($lastCleanup > time() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
-            return $this;
-        }
-
         /**
          * @var \Magento\Cron\Model\Resource\Schedule\Collection $history
          */

app/code/Magento/Cron/Test/Unit/Model/ObserverTest.php

@@ -576,9 +576,6 @@ public function testDispatchCleanup()
         $this->_cache->expects($this->at(0))->method('load')->will($this->returnValue(time() + 10000000));
         $this->_cache->expects($this->at(1))->method('load')->will($this->returnValue(time() - 10000000));
 
-        //XML_PATH_HISTORY_CLEANUP_EVERY
-        $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
-        //XML_PATH_SCHEDULE_LIFETIME
         $this->_scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue(0));
 
         $scheduleMock = $this->getMockBuilder('Magento\Cron\Model\Schedule')->disableOriginalConstructor()->getMock();
@@ -633,8 +630,7 @@ public function testMissedJobsCleanedInTime()
         $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')->will(
-            $this->returnValue(true));
+        $schedule2->expects($this->never())->method('delete');
 
         $this->_collection->addItem($schedule1);
         $this->_config->expects($this->once())->method('getJobs')->will($this->returnValue($jobConfig));
@@ -683,6 +679,5 @@ public function testMissedJobsCleanedInTime()
         $this->_scheduleFactory->expects($this->at(1))->method('create')->will($this->returnValue($scheduleMock));
 
         $this->_observer->dispatch('');
-
     }
 }