diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/db.php | 4 | ||||
| -rw-r--r-- | tests/phpunit-autotest.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/db.php b/tests/lib/db.php index 3c38acb558b..afbdb413c3d 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -37,7 +37,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { $result = $query->execute(array('uri_1')); $this->assertTrue((bool)$result); $row = $result->fetchRow(); - $this->assertFalse($row); + $this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)'); $result = $query->execute(array('fullname test', 'uri_1')); $this->assertTrue((bool)$result); @@ -48,7 +48,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { $this->assertArrayHasKey('fullname', $row); $this->assertEquals($row['fullname'], 'fullname test'); $row = $result->fetchRow(); - $this->assertFalse($row); + $this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null } /** diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index d74451cbe6c..9d6750751f3 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <phpunit bootstrap="bootstrap.php" strict="true" - timeoutForSmallTests="3" - timeoutForMediumTests="30" - timeoutForLargeTests="90" + timeoutForSmallTests="30" + timeoutForMediumTests="300" + timeoutForLargeTests="900" > <testsuite name='ownCloud'> <directory suffix='.php'>lib/</directory> |