From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 11 Jun 2013 08:52:10 +0000 (-0700)
Subject: Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
X-Git-Tag: v6.0.0alpha2~664
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74b1f7d448f2d1f73817b7c8508db687d39856c7;p=nextcloud-server.git

Merge pull request #3646 from owncloud/introduce_phpunit_timeouts

add timeouts 3/30/90 to phpunit tests
---

74b1f7d448f2d1f73817b7c8508db687d39856c7
diff --cc tests/lib/db.php
index 7b2a5e309f0,924236604c6..3c38acb558b
--- a/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);
  	}