diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:55:08 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:55:08 +0200 |
| commit | 55450deee2acbdf112f5c206673b3215ca10dfcb (patch) | |
| tree | 09fa0f810524ed353f868194059f336c6f26eb50 /tests | |
| parent | 351c2e1b0d3fdca80a5483d708d7c71084226e68 (diff) | |
| parent | e30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff) | |
merge upstream
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/README.md | 2 | ||||
| -rw-r--r-- | tests/codeigniter/core/Benchmark_test.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/README.md b/tests/README.md index b46f344cb..c8fc608e8 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,6 +1,6 @@ # CodeIgniter Unit Tests # -Status : [](http://travis-ci.org/EllisLab/CodeIgniter) +Status : [](http://travis-ci.org/EllisLab/CodeIgniter) ### Introduction: diff --git a/tests/codeigniter/core/Benchmark_test.php b/tests/codeigniter/core/Benchmark_test.php index 2790b582e..109b38821 100644 --- a/tests/codeigniter/core/Benchmark_test.php +++ b/tests/codeigniter/core/Benchmark_test.php @@ -29,8 +29,8 @@ class Benchmark_test extends CI_TestCase { $this->benchmark->mark('code_start'); sleep(1); $this->benchmark->mark('code_end'); - - $this->assertEquals('1.00', $this->benchmark->elapsed_time('code_start', 'code_end', 3)); + + $this->assertEquals('1.0', $this->benchmark->elapsed_time('code_start', 'code_end', 1)); } // -------------------------------------------------------------------- |