Skip to content

[stable29] fix: use proper jailed patch in watcher #44748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Apr 11, 2024
Merged

[stable29] fix: use proper jailed patch in watcher #44748

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c142a3
fix: use proper jailed patch in watcher
icewind1991 Apr 8, 2024
338c8aa
test: add test for jail watcher
icewind1991 Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: add test for jail watcher 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Apr 9, 2024
commit 338c8aaea4ca93b74be53c338904c2fc32d66b3e
30 changes: 30 additions & 0 deletions tests/lib/Files/Cache/Wrapper/CacheJailTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OC\Files\Cache\Wrapper\CacheJail;
use OC\Files\Search\SearchComparison;
use OC\Files\Search\SearchQuery;
use OC\Files\Storage\Wrapper\Jail;
use OC\User\User;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Search\ISearchComparison;
Expand Down Expand Up @@ -218,4 +219,33 @@ public function testRootJail() {
$this->assertCount(1, $result);
$this->assertEquals('foo/bar/asd', $result[0]['path']);
}

public function testWatcher() {
$storage = new Jail([
'storage' => $this->storage,
'root' => 'foo'
]);
$storage->getScanner()->scan('');
$storage->file_put_contents('bar', 'asd');

$this->assertFalse($this->cache->inCache('bar'));
$storage->getWatcher()->update('bar', ['mimetype' => 'text/plain']);
$this->assertTrue($this->cache->inCache('bar'));
}

public function testWatcherAfterInnerWatcher() {
$storage = new Jail([
'storage' => $this->storage,
'root' => 'foo'
]);
$storage->getScanner()->scan('');
$storage->file_put_contents('bar', 'asd');

// let the underlying storage create it's watcher first
$this->storage->getWatcher();

$this->assertFalse($this->cache->inCache('bar'));
$storage->getWatcher()->update('bar', ['mimetype' => 'text/plain']);
$this->assertTrue($this->cache->inCache('bar'));
}
}