Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-07-03 11:09:26 +02:00
commit 05e7fa74e0

View File

@ -215,8 +215,11 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
public function testLoadCss()
{
$this->expectOutputRegex('/.*FILE: codemirror.css.php.*/');
$this->assertTrue($this->object->loadCss());
$this->markTestIncomplete(
'This test seems to cause some problems in output buffering handling'
);
//$this->expectOutputRegex('/.*FILE: codemirror.css.php.*/');
//$this->assertTrue($this->object->loadCss());
}
/**