Skip to content

Commit 4ca756e

Browse files
committed
fix bug
1 parent 06876f6 commit 4ca756e

File tree

3 files changed

+14
-33
lines changed

3 files changed

+14
-33
lines changed

tests/CrontabTest.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class CrontabTest extends PHPUnit_Framework_TestCase
1111
public function testStart()
1212
{
1313
$log_file = "/tmp/test_start.log";
14-
$logger = new \Monolog\Logger(new \Monolog\Handler\StreamHandler($log_file));
14+
$logger = new \Monolog\Logger(\Jenner\Crontab\Crontab::NAME);
15+
$logger->pushHandler(new \Monolog\Handler\StreamHandler($log_file));
1516
$mission = new \Jenner\Crontab\Mission("mission_test", "ls /", "* * * * *", $logger);
1617
$crontab = new \Jenner\Crontab\Crontab(null, array($mission));
1718

@@ -25,8 +26,10 @@ public function testError()
2526
{
2627
$log_file = "/tmp/test_error.log";
2728
$err_file = "/tmp/test_error_err.log";
28-
$out = new \Monolog\Logger(new \Monolog\Handler\StreamHandler($log_file));
29-
$err = new \Monolog\Logger(new \Monolog\Handler\StreamHandler($err_file));
29+
$out = new \Monolog\Logger(\Jenner\Crontab\Crontab::NAME);
30+
$out->pushHandler(new \Monolog\Handler\StreamHandler($log_file));
31+
$err = new \Monolog\Logger(\Jenner\Crontab\Crontab::NAME);
32+
$err->pushHandler(new \Monolog\Handler\StreamHandler($err_file));
3033
$mission = new \Jenner\Crontab\Mission("mission_test", "ls / && command_not_exists", "* * * * *", $out, $err);
3134
$crontab = new \Jenner\Crontab\Crontab(null, array($mission));
3235

@@ -42,7 +45,8 @@ public function testError()
4245
public function testNotStart()
4346
{
4447
$log_file = "/tmp/test_not_start.log";
45-
$logger = new \Monolog\Logger(new \Monolog\Handler\StreamHandler($log_file));
48+
$logger = new \Monolog\Logger(\Jenner\Crontab\Crontab::NAME);
49+
$logger->pushHandler(new \Monolog\Handler\StreamHandler($log_file));
4650
$mission = new \Jenner\Crontab\Mission("mission_test", "ls /", "3 * * * *", $logger);
4751
$crontab = new \Jenner\Crontab\Crontab(null, array($mission));
4852

tests/MissionTest.php

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ class MissionTest extends PHPUnit_Framework_TestCase
2020

2121
public function setUp()
2222
{
23-
24-
}
25-
26-
public function testNeed()
27-
{
28-
$logger = new \Monolog\Logger(new \Monolog\Handler\StreamHandler($this->log_file));
23+
$logger = new \Monolog\Logger(\Jenner\Crontab\Crontab::NAME);
24+
$logger->pushHandler(new \Monolog\Handler\StreamHandler($this->log_file));
2925

3026
$this->mission = new \Jenner\Crontab\Mission(
3127
"mission_test",
3228
"ls /",
3329
"* * * * *",
3430
$logger
3531
);
32+
}
33+
34+
public function testNeed()
35+
{
3636
$this->assertTrue($this->mission->needRun(time()));
3737
$this->assertTrue($this->mission->needRun(time() + 60));
3838
$this->assertTrue($this->mission->needRun(time() + 120));
@@ -41,19 +41,8 @@ public function testNeed()
4141

4242
public function testRun()
4343
{
44-
$stream = new \Monolog\Handler\StreamHandler($this->log_file);
45-
$logger = new \Monolog\Logger($stream);
46-
47-
$this->mission = new \Jenner\Crontab\Mission(
48-
"mission_test",
49-
"ls /",
50-
"* * * * *",
51-
$logger
52-
);
53-
5444
$this->mission->start();
5545
$this->mission->wait();
56-
5746
$this->assertEquals($this->mission->errno(), 0);
5847
$out = file_get_contents($this->log_file);
5948
$except = shell_exec("ls /");

tests/logger.test.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)