Merge pull request #14598 from nextcloud/backport/14425/stable14

[stable14] Do not calculate folder size for parent that also needs proper scan, fixes #3524

1 files changed, 38 insertions, 0 deletions

diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php
index 075716f8033..028bb9f40d2 100644
--- a/tests/lib/Files/Cache/ScannerTest.php
+++ b/tests/lib/Files/Cache/ScannerTest.php
@@ -203,6 +203,44 @@ class ScannerTest extends \Test\TestCase {
 		$this->assertFalse($this->cache->getIncomplete());
 	}
 
+	public function testBackgroundScanNestedIncompleteFolders() {
+		$this->storage->mkdir('folder');
+		$this->scanner->backgroundScan();
+		
+		$this->storage->mkdir('folder/subfolder1');
+		$this->storage->mkdir('folder/subfolder2');
+		
+		$this->storage->mkdir('folder/subfolder1/subfolder3');
+		$this->cache->put('folder', ['size' => -1]);
+		$this->cache->put('folder/subfolder1', ['size' => -1]);
+		
+		// do a scan to get the folders into the cache.
+		$this->scanner->backgroundScan();
+
+		$this->assertTrue($this->cache->inCache('folder/subfolder1/subfolder3'));
+		
+		$this->storage->file_put_contents('folder/subfolder1/bar1.txt', 'foobar');
+		$this->storage->file_put_contents('folder/subfolder1/subfolder3/bar3.txt', 'foobar');
+		$this->storage->file_put_contents('folder/subfolder2/bar2.txt', 'foobar');
+
+		//mark folders as incomplete.
+		$this->cache->put('folder/subfolder1', ['size' => -1]);
+		$this->cache->put('folder/subfolder2', ['size' => -1]);
+		$this->cache->put('folder/subfolder1/subfolder3', ['size' => -1]);
+		
+		$this->scanner->backgroundScan();
+
+		$this->assertTrue($this->cache->inCache('folder/subfolder1/bar1.txt'));
+		$this->assertTrue($this->cache->inCache('folder/subfolder2/bar2.txt'));
+		$this->assertTrue($this->cache->inCache('folder/subfolder1/subfolder3/bar3.txt'));
+
+		//check if folder sizes are correct.
+		$this->assertEquals(18, $this->cache->get('folder')['size']);
+		$this->assertEquals(12, $this->cache->get('folder/subfolder1')['size']);
+		$this->assertEquals(6, $this->cache->get('folder/subfolder1/subfolder3')['size']);
+		$this->assertEquals(6, $this->cache->get('folder/subfolder2')['size']);
+	}
+
 	public function testReuseExisting() {
 		$this->fillTestFolders();