summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-05-16 18:26:32 +0200
committerAndrey Andreev <narf@bofh.bg>2012-05-16 18:26:32 +0200
commitc59e8720177d96a1dec1b2cbcd6296bbfceb4a2b (patch)
tree2009ecdf626f0b86adf683dfbe04a71de388b3be /tests
parent8279420f989a8cda4427c3983ee919c6a1073dd7 (diff)
parent09a1b5e7fb3c930aa9a50e246236227a499b5d28 (diff)
Merge pull request #1364 from toopay/core-tests
Reduce decimal points, since there is a micro differencess on runtime an...
Diffstat (limited to 'tests')
-rw-r--r--tests/README.md2
-rw-r--r--tests/codeigniter/core/Benchmark_test.php4
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 : [![Build Status](https://secure.travis-ci.org/EllisLab/CodeIgniter.png?branch=feature/unit-tests)](http://travis-ci.org/EllisLab/CodeIgniter)
+Status : [![Build Status](https://secure.travis-ci.org/EllisLab/CodeIgniter.png?branch=develop)](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));
}
// --------------------------------------------------------------------