Merge pull request #26855 from owncloud/obliterate-legacy-home-fallback

Nuke the legacy storage fallback from orbit
owncloud · Dec 21, 2016 · f3c0373 · f3c0373
2 parents 1efce85 + d29d2d6
commit f3c0373
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 51 deletions.
diff --git a/lib/private/Files/Mount/LocalHomeMountProvider.php b/lib/private/Files/Mount/LocalHomeMountProvider.php
@@ -38,9 +38,6 @@ class LocalHomeMountProvider implements IHomeMountProvider {
 	 */
 	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
 		$arguments = ['user' => $user];
-		if (\OC\Files\Cache\Storage::exists('local::' . $user->getHome() . '/')) {
-			$arguments['legacy'] = true;
-		}
 		return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader);
 	}
 }
diff --git a/lib/private/Files/Storage/Home.php b/lib/private/Files/Storage/Home.php
@@ -43,19 +43,12 @@ class Home extends Local implements \OCP\Files\IHomeStorage {
 	/**
 	 * Construct a Home storage instance
 	 * @param array $arguments array with "user" containing the
-	 * storage owner and "legacy" containing "true" if the storage is
-	 * a legacy storage with "local::" URL instead of the new "home::" one.
+	 * storage owner
 	 */
 	public function __construct($arguments) {
 		$this->user = $arguments['user'];
 		$datadir = $this->user->getHome();
-		if (isset($arguments['legacy']) && $arguments['legacy']) {
-			// legacy home id (<= 5.0.12)
-			$this->id = 'local::' . $datadir . '/';
-		}
-		else {
-		    $this->id = 'home::' . $this->user->getUID();
-		}
+		$this->id = 'home::' . $this->user->getUID();
 
 		parent::__construct(['datadir' => $datadir]);
 	}

diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
@@ -451,37 +451,6 @@ public function testHomeMount() {
 		if ($user !== null) { $user->delete(); }
 	}
 
-	/**
-	 * Tests that the home storage is used in legacy mode
-	 * for the user's mount point
-	 */
-	public function testLegacyHomeMount() {
-		if (getenv('RUN_OBJECTSTORE_TESTS')) {
-			$this->markTestSkipped('legacy storage unrelated to objectstore environments');
-		}
-		$datadir = \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data");
-		$userId = $this->getUniqueID('user_');
-
-		// insert storage into DB by constructing it
-		// to make initMountsPoint find its existence
-		$localStorage = new \OC\Files\Storage\Local(['datadir' => $datadir . '/' . $userId . '/']);
-		// this will trigger the insert
-		$cache = $localStorage->getCache();
-
-		\OC::$server->getUserManager()->createUser($userId, $userId);
-		\OC\Files\Filesystem::initMountPoints($userId);
-
-		$homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
-
-		$this->assertTrue($homeMount->instanceOfStorage('\OC\Files\Storage\Home'));
-		$this->assertEquals('local::' . $datadir . '/' . $userId . '/', $homeMount->getId());
-
-		$user = \OC::$server->getUserManager()->get($userId);
-		if ($user !== null) { $user->delete(); }
-		// delete storage entry
-		$cache->clear();
-	}
-
 	public function dummyHook($arguments) {
 		$path = $arguments['path'];
 		$this->assertEquals($path, \OC\Files\Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized

diff --git a/tests/lib/Files/Storage/HomeTest.php b/tests/lib/Files/Storage/HomeTest.php
@@ -88,14 +88,6 @@ public function testId() {
 		$this->assertEquals('home::' . $this->userId, $this->instance->getId());
 	}
 
-	/**
-	 * Tests that the legacy home id is in the format local::/path/to/datadir/user1/
-	 */
-	public function testLegacyId() {
-		$this->instance = new \OC\Files\Storage\Home(['user' => $this->user, 'legacy' => true]);
-		$this->assertEquals('local::' . $this->tmpDir . '/', $this->instance->getId());
-	}
-
 	/**
 	 * Tests that getCache() returns an instance of HomeCache
 	 */