aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-06-05 13:18:18 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-06-05 13:18:18 +0200
commite1beb8c6c38d48eb923ed323dea25110e4bbacfd (patch)
tree5ef18fab7910f2d86b21965792f5e5c0246cf799 /tests
parentbbdcbb99117dda8ca63b48b72e86bfc7e6ff648d (diff)
parent9dab6ec2ec29852a32b2d3f21f3115c86c3797bc (diff)
downloadnextcloud-server-e1beb8c6c38d48eb923ed323dea25110e4bbacfd.tar.gz
nextcloud-server-e1beb8c6c38d48eb923ed323dea25110e4bbacfd.zip
Merge pull request #8889 from owncloud/mtime-reuse
Don't update the mtime if the storage mtime hasn't changed
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/utils/scanner.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 159a2a48677..5e5cc6ac128 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -112,7 +112,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
$this->assertEquals(array('/foo', '/foo/folder', '/foo/folder/bar.txt', '/foo/foo.txt'), $changes);
$this->assertEquals(array('/', '/foo', '/foo/folder'), $parents);
- $cache->put('foo.txt', array('mtime' => time() - 50));
+ $cache->put('foo.txt', array('storage_mtime' => time() - 50));
$propagator = $this->getMock('\OC\Files\Cache\ChangePropagator', array('propagateChanges'), array(), '', false);
$scanner->setPropagator($propagator);
@@ -128,7 +128,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
$scanner->setPropagator($originalPropagator);
$oldInfo = $cache->get('');
- $cache->put('foo.txt', array('mtime' => time() - 70));
+ $cache->put('foo.txt', array('storage_mtime' => time() - 70));
$storage->file_put_contents('foo.txt', 'asdasd');
$scanner->scan('');