diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-23 10:25:12 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-23 10:25:12 -0400 |
| commit | 30330b4343b5bca82b95d9df4a13651c8e91063d (patch) | |
| tree | 68979fb843a309e43803935f53afe74fab2844e4 /tests/lib/files/cache/watcher.php | |
| parent | 3b6d850e592bbc6db9d67d25ee700c0730c84376 (diff) | |
| parent | 698862519de6b364da6c20a97d8c546204e80f3d (diff) | |
| download | nextcloud-server-30330b4343b5bca82b95d9df4a13651c8e91063d.tar.gz nextcloud-server-30330b4343b5bca82b95d9df4a13651c8e91063d.zip | |
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
Diffstat (limited to 'tests/lib/files/cache/watcher.php')
| -rw-r--r-- | tests/lib/files/cache/watcher.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php index 8ef6ab44d10..e43c86ed438 100644 --- a/tests/lib/files/cache/watcher.php +++ b/tests/lib/files/cache/watcher.php @@ -35,7 +35,7 @@ class Watcher extends \PHPUnit_Framework_TestCase { $updater = $storage->getWatcher(); //set the mtime to the past so it can detect an mtime change - $cache->put('', array('mtime' => 10)); + $cache->put('', array('storage_mtime' => 10)); $this->assertTrue($cache->inCache('folder/bar.txt')); $this->assertTrue($cache->inCache('folder/bar2.txt')); @@ -47,14 +47,14 @@ class Watcher extends \PHPUnit_Framework_TestCase { $cachedData = $cache->get('bar.test'); $this->assertEquals(3, $cachedData['size']); - $cache->put('bar.test', array('mtime' => 10)); + $cache->put('bar.test', array('storage_mtime' => 10)); $storage->file_put_contents('bar.test', 'test data'); $updater->checkUpdate('bar.test'); $cachedData = $cache->get('bar.test'); $this->assertEquals(9, $cachedData['size']); - $cache->put('folder', array('mtime' => 10)); + $cache->put('folder', array('storage_mtime' => 10)); $storage->unlink('folder/bar2.txt'); $updater->checkUpdate('folder'); @@ -69,7 +69,7 @@ class Watcher extends \PHPUnit_Framework_TestCase { $updater = $storage->getWatcher(); //set the mtime to the past so it can detect an mtime change - $cache->put('', array('mtime' => 10)); + $cache->put('', array('storage_mtime' => 10)); $storage->unlink('foo.txt'); $storage->rename('folder', 'foo.txt'); @@ -85,7 +85,7 @@ class Watcher extends \PHPUnit_Framework_TestCase { $updater = $storage->getWatcher(); //set the mtime to the past so it can detect an mtime change - $cache->put('foo.txt', array('mtime' => 10)); + $cache->put('foo.txt', array('storage_mtime' => 10)); $storage->unlink('foo.txt'); $storage->rename('folder', 'foo.txt'); |