Merge branch 'master' into storage-test-cleanup

Conflicts:
	tests/lib/files/storage/storage.php

diff --cc tests/lib/files/storage/storage.php
index 46818c3b4a10f14d80f8395d422ac8083c427560,fbf502fbc1c41e5efb426ecfb57e60531db0e5e3..3f339a10016a29b716a9c49d24b702f84c35b7e8
--- 1/tests/lib/files/storage/storage.php
--- 2/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@@ -186,11 -197,47 +186,11 @@@ abstract class Storage extends \PHPUnit
                }
  
                $mtimeStart = time();
 -              $fh = $this->instance->fopen('/lorem.txt', 'a');
 -              fwrite($fh, ' ');
 -              fclose($fh);
 -              clearstatcache();
 -              $mtimeEnd = time();
 -              $mTime = $this->instance->filemtime('/lorem.txt');
 -              $this->assertTrue(($mtimeStart - 5) <= $mTime);
 -              $this->assertTrue($mTime <= ($mtimeEnd + 5));
  
                $this->instance->unlink('/lorem.txt');
-               $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 1));
+               $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 5));
        }
  
 -      public function testSearch() {
 -              $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
 -              $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
 -              $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
 -              $this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r'));
 -              $svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
 -              $this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
 -              $result = $this->instance->search('logo');
 -              $this->assertEquals(2, count($result));
 -              $this->assertContains('/logo-wide.svg', $result);
 -              $this->assertContains('/logo-wide.png', $result);
 -      }
 -
 -      public function testSearchInSubFolder() {
 -              $this->instance->mkdir('sub');
 -              $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
 -              $this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r'));
 -              $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
 -              $this->instance->file_put_contents('/sub/logo-wide.png', file_get_contents($pngFile, 'r'));
 -              $svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
 -              $this->instance->file_put_contents('/sub/logo-wide.svg', file_get_contents($svgFile, 'r'));
 -
 -              $result = $this->instance->search('logo');
 -              $this->assertEquals(2, count($result));
 -              $this->assertContains('/sub/logo-wide.svg', $result);
 -              $this->assertContains('/sub/logo-wide.png', $result);
 -      }
 -
        public function testFOpen() {
                $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';