Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use CronHelper service in cron workers [MAILPOET-2459]

Browse Source
This commit is contained in:
wxa
2019-10-30 16:26:38 +03:00
committed by Jack Kitterhing
parent 3436fed6e7
commit 81caa04479
14 changed files with 131 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/Cron/Workers/SimpleWorkerTest.php
View File

@ -7,6 +7,7 @@ use Codeception\Stub;
use Codeception\Stub\Expected;
use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Workers\SimpleWorkerMockImplementation as MockSimpleWorker;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\Setting;
@ -15,6 +16,7 @@ require_once('SimpleWorkerMockImplementation.php');
class SimpleWorkerTest extends \MailPoetTest {
function _before() {
parent::_before();
$this->cron_helper = ContainerWrapper::getInstance()->get(CronHelper::class);
$this->worker = new MockSimpleWorker();
}
@ -40,7 +42,7 @@ class SimpleWorkerTest extends \MailPoetTest {
function testItThrowsExceptionWhenExecutionLimitIsReached() {
try {
new MockSimpleWorker(
microtime(true) - CronHelper::getDaemonExecutionLimit()
microtime(true) - $this->cron_helper->getDaemonExecutionLimit()
);
self::fail('Maximum execution time limit exception was not thrown.');
} catch (\Exception $e) {
@ -213,7 +215,7 @@ class SimpleWorkerTest extends \MailPoetTest {
[],
[
'processTaskStrategy' => function () {
CronHelper::enforceExecutionLimit(microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT - 1);
$this->cron_helper->enforceExecutionLimit(microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT - 1);
},
],
$this