Merge branch 'MAGETWO-83782' into 2.2-bugfixes-280218

Author: Dmytro Voskoboinikov

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

@@ -290,8 +290,15 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
 
         try {
             call_user_func_array($callback, [$schedule]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
+            if (!$e instanceof \Exception) {
+                $e = new \RuntimeException(
+                    'Error when running a cron job',
+                    0,
+                    $e
+                );
+            }
             throw $e;
         }
 

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

@@ -12,8 +12,27 @@
 
 class CronJobException
 {
+    /**
+     * @var \Throwable|null
+     */
+    private $exception;
+
+    /**
+     * @param \Throwable|null $exception
+     */
+    public function __construct(\Throwable $exception = null)
+    {
+        $this->exception = $exception;
+    }
+
+    /**
+     * @throws \Throwable
+     */
     public function execute()
     {
-        throw new \Exception('Test exception');
+        if (!$this->exception) {
+            $this->exception = new \Exception('Test exception');
+        }
+        throw $this->exception;
     }
 }

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -468,6 +468,7 @@ public function testDispatchExceptionInCallback(
      */
     public function dispatchExceptionInCallbackDataProvider()
     {
+        $throwable = new \TypeError();
         return [
             'non-callable callback' => [
                 'Not_Existed_Class',
@@ -483,6 +484,19 @@ public function dispatchExceptionInCallbackDataProvider()
                 2,
                 new \Exception(__('Test exception'))
             ],
+            'throwable in execution' => [
+                'CronJobException',
+                new \Magento\Cron\Test\Unit\Model\CronJobException(
+                    $throwable
+                ),
+                'Error when running a cron job',
+                2,
+                new \RuntimeException(
+                    'Error when running a cron job',
+                    0,
+                    $throwable
+                )
+            ],
         ];
     }