diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-03-05 11:49:31 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-04-13 15:13:03 +0200 |
| commit | 0772e3b4c11a387dfcd774caf1018d73106cd064 (patch) | |
| tree | af9d8ea86950385b36b380f9cd370831084d78d8 /tests/lib/files/view.php | |
| parent | 404773940daf9c5a686b92d65dd39fb44d766050 (diff) | |
| download | nextcloud-server-0772e3b4c11a387dfcd774caf1018d73106cd064.tar.gz nextcloud-server-0772e3b4c11a387dfcd774caf1018d73106cd064.zip | |
Properly handle copy/move failures in cross storage copy/move
Diffstat (limited to 'tests/lib/files/view.php')
| -rw-r--r-- | tests/lib/files/view.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 3b5e3aa3b08..269b8b23e7d 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -944,8 +944,19 @@ class View extends \Test\TestCase { private function doTestCopyRenameFail($operation) { $storage1 = new Temporary(array()); - $storage2 = new Temporary(array()); - $storage2 = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage2, 'quota' => 9)); + /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage2 */ + $storage2 = $this->getMockBuilder('\Test\Files\TemporaryNoCross') + ->setConstructorArgs([[]]) + ->setMethods(['fopen']) + ->getMock(); + + $storage2->expects($this->any()) + ->method('fopen') + ->will($this->returnCallback(function($path, $mode) use($storage2) { + $source = fopen($storage2->getSourcePath($path), $mode); + return \OC\Files\Stream\Quota::wrap($source, 9); + })); + $storage1->mkdir('sub'); $storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH'); $storage1->mkdir('dirtomove'); @@ -976,10 +987,8 @@ class View extends \Test\TestCase { $this->assertFalse($view->$operation('/test/dirtomove/', '/test/sub/storage/dirtomove/')); // since the move failed, the full source tree is kept $this->assertTrue($storage1->file_exists('dirtomove/indir1.txt')); - // but the target file stays - $this->assertTrue($storage2->file_exists('dirtomove/indir1.txt')); - // second file not moved/copied $this->assertTrue($storage1->file_exists('dirtomove/indir2.txt')); + // second file not moved/copied $this->assertFalse($storage2->file_exists('dirtomove/indir2.txt')); $this->assertFalse($storage2->getCache()->get('dirtomove/indir2.txt')); |