Merge pull request #13208 from owncloud/hhvm-streamwrapper-exception

HHVM Workaround: Do not use Exception from Stream.
This commit is contained in:
Thomas Müller 2015-01-09 18:02:28 +01:00
commit 9fb61b42f6

View file

@ -48,20 +48,13 @@ class Test_StreamWrappers extends \Test\TestCase {
//test callback
$tmpFile = OC_Helper::TmpFile('.txt');
$file = 'close://' . $tmpFile;
\OC\Files\Stream\Close::registerCallback($tmpFile, array('Test_StreamWrappers', 'closeCallBack'));
$actual = false;
$callback = function($path) use (&$actual) { $actual = $path; };
\OC\Files\Stream\Close::registerCallback($tmpFile, $callback);
$fh = fopen($file, 'w');
fwrite($fh, 'asd');
try {
fclose($fh);
$this->fail('Expected exception');
} catch (Exception $e) {
$path = $e->getMessage();
$this->assertEquals($path, $tmpFile);
}
}
public static function closeCallBack($path) {
throw new Exception($path);
fclose($fh);
$this->assertSame($tmpFile, $actual);
}
public function testOC() {