Merge pull request #3646 from owncloud/introduce_phpunit_timeouts

add timeouts 3/30/90 to phpunit tests

diff --cc tests/lib/db.php
index 7b2a5e309f0151f1588bcf207f42ec1c3bdf4438,924236604c64319a229bb714da2f6728bca76564..3c38acb558b16f6939d584ef3846f3e855dcf606
--- 1/tests/lib/db.php
--- 2/tests/lib/db.php
+++ b/tests/lib/db.php
@@@ -51,11 -51,14 +51,14 @@@ class Test_DB extends PHPUnit_Framework
                $this->assertFalse($row);
        }
  
+       /**
+        * @medium
+        */
        public function testNOW() {
 -              $query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (NOW(),?)');
 +              $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)');
                $result = $query->execute(array('uri_2'));
                $this->assertTrue((bool)$result);
 -              $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 +              $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
                $result = $query->execute(array('uri_2'));
                $this->assertTrue((bool)$result);
        }

diff --cc tests/lib/dbschema.php
Simple merge