mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
Merge pull request #2508 from ptitlazy/ticket/12597
[ticket/12597] Command for executing all available cron tasks * ptitlazy/ticket/12597: (27 commits) [ticket/12597] Reformating an acp message [ticket/12597] Modifiying acp message [ticket/12597] Fix wrong global variable name [ticket/12597] Typo correction [ticket/12597] Typo corrections [ticket/12597] Changing place of lock release in execute() method [ticket/12597] Fix test file [ticket/12597] Typing corrections and improvement of code consistency [ticket/12597] Fix various mistakes [ticket/12597] Fix various mistakes [ticket/12597] Fix visibilty of two functions in run.php [ticket/12597] Refactoring and test improving [ticket/12597] Fix language key name [ticket/12597] Fix coding style and typing mistakes [ticket/12597] Changes name of command cron:run-all to cron:run. [ticket/12597] Fix various problems [ticket/12597] Fix constructor bug and servral doc blocs [ticket/12597] Modification of return statuses and of test files [ticket/12597] Fix misplaced release of db lock [ticket/12597] Change EXECUTE to RUN in language ...
This commit is contained in:
Andreas Fischer
8
tests/console/cron/fixtures/config.xml
Normal file
8
tests/console/cron/fixtures/config.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<dataset>
|
||||
<table name="phpbb_config">
|
||||
<column>config_name</column>
|
||||
<column>config_value</column>
|
||||
<column>is_dynamic</column>
|
||||
</table>
|
||||
</dataset>
|
||||
157
tests/console/cron/run_test.php
Normal file
157
tests/console/cron/run_test.php
Normal file
@@ -0,0 +1,157 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* This file is part of the phpBB Forum Software package.
|
||||
*
|
||||
* @copyright (c) phpBB Limited
|
||||
* @license GNU General Public License, version 2 (GPL-2.0)
|
||||
*
|
||||
* For full copyright and license information, please see
|
||||
* the docs/CREDITS.txt file.
|
||||
*
|
||||
*/
|
||||
|
||||
use Symfony\Component\Console\Application;
|
||||
use Symfony\Component\Console\Tester\CommandTester;
|
||||
use phpbb\console\command\cron\run;
|
||||
|
||||
require_once dirname(__FILE__) . '/tasks/simple.php';
|
||||
|
||||
class phpbb_console_command_cron_run_test extends phpbb_database_test_case
|
||||
{
|
||||
protected $db;
|
||||
protected $config;
|
||||
protected $lock;
|
||||
protected $user;
|
||||
protected $cron_manager;
|
||||
protected $command_name;
|
||||
protected $task;
|
||||
|
||||
public function getDataSet()
|
||||
{
|
||||
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
|
||||
}
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
global $db, $config, $phpbb_root_path, $phpEx;
|
||||
|
||||
$db = $this->db = $this->new_dbal();
|
||||
$config = $this->config = new \phpbb\config\config(array('cron_lock' => '0'));
|
||||
set_config(null, null, null, $this->config);
|
||||
$this->lock = new \phpbb\lock\db('cron_lock', $this->config, $this->db);
|
||||
|
||||
$this->user = $this->getMock('\phpbb\user');
|
||||
$this->user->method('lang')->will($this->returnArgument(0));
|
||||
|
||||
$this->task = new phpbb_cron_task_simple();
|
||||
$tasks = array(
|
||||
$this->task,
|
||||
);
|
||||
$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $phbEx);
|
||||
|
||||
$this->assertSame('0', $config['cron_lock']);
|
||||
}
|
||||
|
||||
public function test_normal_use()
|
||||
{
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name));
|
||||
|
||||
$this->assertSame('', $command_tester->getDisplay());
|
||||
$this->assertSame(true, $this->task->executed);
|
||||
$this->assertSame(0, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function test_verbose_mode()
|
||||
{
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name, '--verbose' => true));
|
||||
|
||||
$this->assertContains('RUNNING_TASK', $command_tester->getDisplay());
|
||||
$this->assertSame(true, $this->task->executed);
|
||||
$this->assertSame(0, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function test_error_lock()
|
||||
{
|
||||
$this->lock->acquire();
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name));
|
||||
|
||||
$this->assertContains('CRON_LOCK_ERROR', $command_tester->getDisplay());
|
||||
$this->assertSame(false, $this->task->executed);
|
||||
$this->assertSame(1, $exit_status);
|
||||
}
|
||||
|
||||
public function test_no_task()
|
||||
{
|
||||
$tasks = array(
|
||||
);
|
||||
$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $phpEx);
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name));
|
||||
|
||||
$this->assertSame('', $command_tester->getDisplay());
|
||||
$this->assertSame(0, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function test_no_task_verbose()
|
||||
{
|
||||
$tasks = array(
|
||||
);
|
||||
$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $phpEx);
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name, '--verbose' => true));
|
||||
|
||||
$this->assertContains('CRON_NO_TASK', $command_tester->getDisplay());
|
||||
$this->assertSame(0, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function test_arg_valid()
|
||||
{
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name, 'name' => 'phpbb_cron_task_simple'));
|
||||
|
||||
$this->assertSame('', $command_tester->getDisplay());
|
||||
$this->assertSame(true, $this->task->executed);
|
||||
$this->assertSame(0, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function test_arg_invalid()
|
||||
{
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name, 'name' => 'foo'));
|
||||
|
||||
$this->assertContains('CRON_NO_SUCH_TASK', $command_tester->getDisplay());
|
||||
$this->assertSame(false, $this->task->executed);
|
||||
$this->assertSame(2, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function test_arg_valid_verbose()
|
||||
{
|
||||
$command_tester = $this->get_command_tester();
|
||||
$exit_status = $command_tester->execute(array('command' => $this->command_name, 'name' => 'phpbb_cron_task_simple', '--verbose' => true));
|
||||
|
||||
$this->assertContains('RUNNING_TASK', $command_tester->getDisplay());
|
||||
$this->assertSame(true, $this->task->executed);
|
||||
$this->assertSame(0, $exit_status);
|
||||
$this->assertSame(false, $this->lock->owns_lock());
|
||||
}
|
||||
|
||||
public function get_command_tester()
|
||||
{
|
||||
$application = new Application();
|
||||
$application->add(new run($this->cron_manager, $this->lock, $this->user));
|
||||
|
||||
$command = $application->find('cron:run');
|
||||
$this->command_name = $command->getName();
|
||||
return new CommandTester($command);
|
||||
}
|
||||
}
|
||||
27
tests/console/cron/tasks/simple.php
Normal file
27
tests/console/cron/tasks/simple.php
Normal file
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* This file is part of the phpBB Forum Software package.
|
||||
*
|
||||
* @copyright (c) phpBB Limited
|
||||
* @license GNU General Public License, version 2 (GPL-2.0)
|
||||
*
|
||||
* For full copyright and license information, please see
|
||||
* the docs/CREDITS.txt file.
|
||||
*
|
||||
*/
|
||||
|
||||
class phpbb_cron_task_simple extends \phpbb\cron\task\base
|
||||
{
|
||||
public $executed = false;
|
||||
|
||||
public function get_name()
|
||||
{
|
||||
return get_class($this);
|
||||
}
|
||||
|
||||
public function run()
|
||||
{
|
||||
$this->executed = true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user