summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-07-03 17:03:47 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-07-03 17:03:47 +0200
commit32d69f68896c08e216bc0e84db409d00ec654856 (patch)
treebdc5d05a851eeeb0828f01dd9925f9c2ea0f0683 /tests
parente789e056759aedb93d9eba3a8598acea67c842c6 (diff)
parent33e1ced53c31443ad9918d6bdd7d20afc628ccbd (diff)
downloadnextcloud-server-32d69f68896c08e216bc0e84db409d00ec654856.tar.gz
nextcloud-server-32d69f68896c08e216bc0e84db409d00ec654856.zip
Merge branch 'master' into convert-oc_config
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/cache/updater.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index b2db27e42e0..5d7997b0544 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -201,11 +201,13 @@ class Updater extends \PHPUnit_Framework_TestCase {
$cachedData = $cache2->get('');
$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
- $this->assertEquals($mtime, $cachedData['mtime']);
+ // rename can cause mtime change - invalid assert
+// $this->assertEquals($mtime, $cachedData['mtime']);
$cachedData = $this->cache->get('folder');
$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
- $this->assertEquals($mtime, $cachedData['mtime']);
+ // rename can cause mtime change - invalid assert
+// $this->assertEquals($mtime, $cachedData['mtime']);
}
public function testTouch() {