[Pkg-owncloud-commits] [owncloud] 93/215: remove duplicates from rebase

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b5c62cdad640ca9d0c2c184a61f9f0d683f22509
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Apr 8 13:53:22 2015 +0200

    remove duplicates from rebase
---
 apps/files_sharing/tests/propagation.php | 48 --------------------------------
 1 file changed, 48 deletions(-)

diff --git a/apps/files_sharing/tests/propagation.php b/apps/files_sharing/tests/propagation.php
index c42dccc..1949f78 100644
--- a/apps/files_sharing/tests/propagation.php
+++ b/apps/files_sharing/tests/propagation.php
@@ -242,52 +242,4 @@ class Propagation extends TestCase {
 		$newRootInfo = $view1->getFileInfo('');
 		$this->assertNotEquals($rootInfo->getEtag(), $newRootInfo->getEtag());
 	}
-
-	public function testSizePropagationWhenOwnerChangesFile() {
-		/**
-		 * @var \OC\Files\View $recipientView
-		 * @var \OC\Files\View $ownerView
-		 */
-		list($recipientView, $ownerView) = $this->setupViews();
-		$sharedFolderInfo = $ownerView->getFileInfo('/sharedfolder', false);
-		\OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31);
-		$ownerRootInfo = $ownerView->getFileInfo('', false);
-		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
-		$this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt'));
-		$recipientRootInfo = $recipientView->getFileInfo('', false);
-		// when file changed as owner
-		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
-		$ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar');
-		// size of recipient's root stays the same
-		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
-		$newRecipientRootInfo = $recipientView->getFileInfo('', false);
-		$this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize());
-		// size of owner's root increases
-		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
-		$newOwnerRootInfo = $ownerView->getFileInfo('', false);
-		$this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize());
-	}
-
-	public function testSizePropagationWhenRecipientChangesFile() {
-		/**
-		 * @var \OC\Files\View $recipientView
-		 * @var \OC\Files\View $ownerView
-		 */
-		list($recipientView, $ownerView) = $this->setupViews();
-		$sharedFolderInfo = $ownerView->getFileInfo('/sharedfolder', false);
-		\OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31);
-		$ownerRootInfo = $ownerView->getFileInfo('', false);
-		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
-		$this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt'));
-		$recipientRootInfo = $recipientView->getFileInfo('', false);
-		// when file changed as recipient
-		$recipientView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar');
-		// size of recipient's root stays the same
-		$newRecipientRootInfo = $recipientView->getFileInfo('', false);
-		$this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize());
-		// size of owner's root increases
-		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
-		$newOwnerRootInfo = $ownerView->getFileInfo('', false);
-		$this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize());
-	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git