Merge pull request #7260 from owncloud/watcher-policy

Allow setting the frequency of which the file watcher checks for updates

2 files changed, 58 insertions, 1 deletions

diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index 1920c276907..7f4f3c5ee98 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -11,7 +11,7 @@ namespace Test\Files\Cache;
 class Watcher extends \PHPUnit_Framework_TestCase {
 
 	/**
-	 * @var \OC\Files\Storage\Storage[] $storages;
+	 * @var \OC\Files\Storage\Storage[] $storages
 	 */
 	private $storages = array();
 
@@ -105,6 +105,60 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($cache->inCache('foo.txt/bar.txt'));
 	}
 
+	public function testPolicyNever() {
+		$storage = $this->getTestStorage();
+		$cache = $storage->getCache();
+		$updater = $storage->getWatcher();
+
+		//set the mtime to the past so it can detect an mtime change
+		$cache->put('foo.txt', array('storage_mtime' => 10));
+
+		$updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_NEVER);
+
+		$storage->file_put_contents('foo.txt', 'q');
+		$this->assertFalse($updater->checkUpdate('foo.txt'));
+
+		$cache->put('foo.txt', array('storage_mtime' => 20));
+		$storage->file_put_contents('foo.txt', 'w');
+		$this->assertFalse($updater->checkUpdate('foo.txt'));
+	}
+
+	public function testPolicyOnce() {
+		$storage = $this->getTestStorage();
+		$cache = $storage->getCache();
+		$updater = $storage->getWatcher();
+
+		//set the mtime to the past so it can detect an mtime change
+		$cache->put('foo.txt', array('storage_mtime' => 10));
+
+		$updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
+
+		$storage->file_put_contents('foo.txt', 'q');
+		$this->assertTrue($updater->checkUpdate('foo.txt'));
+
+		$cache->put('foo.txt', array('storage_mtime' => 20));
+		$storage->file_put_contents('foo.txt', 'w');
+		$this->assertFalse($updater->checkUpdate('foo.txt'));
+	}
+
+	public function testPolicyAlways() {
+		$storage = $this->getTestStorage();
+		$cache = $storage->getCache();
+		$updater = $storage->getWatcher();
+
+		//set the mtime to the past so it can detect an mtime change
+		$cache->put('foo.txt', array('storage_mtime' => 10));
+
+		$updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ALWAYS);
+
+		$storage->file_put_contents('foo.txt', 'q');
+		$this->assertTrue($updater->checkUpdate('foo.txt'));
+
+		$cache->put('foo.txt', array('storage_mtime' => 20));
+		$storage->file_put_contents('foo.txt', 'w');
+		$this->assertTrue($updater->checkUpdate('foo.txt'));
+	}
+
 	/**
 	 * @param bool $scan
 	 * @return \OC\Files\Storage\Storage
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 72a2f854cb2..371d1ed1798 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -7,6 +7,8 @@
 
 namespace Test\Files;
 
+use OC\Files\Cache\Watcher;
+
 class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
 	public function touch($path, $mtime = null) {
 		return false;
@@ -249,6 +251,7 @@ class View extends \PHPUnit_Framework_TestCase {
 	function testWatcher() {
 		$storage1 = $this->getTestStorage();
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		$storage1->getWatcher()->setPolicy(Watcher::CHECK_ALWAYS);
 
 		$rootView = new \OC\Files\View('');