diff options
author | Andreas Fischer <bantu@owncloud.com> | 2015-01-09 17:01:17 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@owncloud.com> | 2015-01-09 17:01:17 +0100 |
commit | df849bb69a38617a038710afc8b63101202a1701 (patch) | |
tree | 5d48ae59f6f2324ad1db33db975ddfa623997444 /tests | |
parent | bedc4664e41b542eae15b1038b22ace817fc447f (diff) | |
download | nextcloud-server-df849bb69a38617a038710afc8b63101202a1701.tar.gz nextcloud-server-df849bb69a38617a038710afc8b63101202a1701.zip |
HHVM Workaround: Do not use Exception from Stream.
Works around https://github.com/facebook/hhvm/issues/2436#issuecomment-69351373
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/streamwrappers.php | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php index 9a3b6bc9266..2a8c8676c16 100644 --- a/tests/lib/streamwrappers.php +++ b/tests/lib/streamwrappers.php @@ -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() { |