summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-22 02:19:27 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-22 02:19:27 -0700
commita2cdf8b91e47e7888cbff5410f2b1b861cdb814f (patch)
tree66791833018b58f4c3f301c1a7122bff403fb695 /tests
parentda892d69ab724354e1b3ee251e540ba306fffe44 (diff)
parentc772a6479d0c2ab9d84b7d6ca3232561fdbcbd2b (diff)
downloadnextcloud-server-a2cdf8b91e47e7888cbff5410f2b1b861cdb814f.tar.gz
nextcloud-server-a2cdf8b91e47e7888cbff5410f2b1b861cdb814f.zip
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
reworking of \OC\Files\Storage\AmazonS3
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/storage/storage.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index fb3e05e66b3..fbf502fbc1c 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -168,10 +168,10 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$this->assertTrue($this->instance->isReadable('/lorem.txt'));
$ctimeEnd = time();
$mTime = $this->instance->filemtime('/lorem.txt');
- $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 1));
- $this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 1));
+ $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
+ $this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 5));
- $this->assertTrue(($ctimeStart - 1) <= $mTime);
+ $this->assertTrue(($ctimeStart - 5) <= $mTime);
$this->assertTrue($mTime <= ($ctimeEnd + 1));
$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
@@ -185,10 +185,10 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$mtimeEnd = time();
if ($supportsTouch !== false) {
$mTime = $this->instance->filemtime('/lorem.txt');
- $this->assertTrue(($mtimeStart - 1) <= $mTime);
- $this->assertTrue($mTime <= ($mtimeEnd + 1));
+ $this->assertTrue(($mtimeStart - 5) <= $mTime);
+ $this->assertTrue($mTime <= ($mtimeEnd + 5));
- $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $mtimeStart - 1));
+ $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $mtimeStart - 5));
if ($this->instance->touch('/lorem.txt', 100) !== false) {
$mTime = $this->instance->filemtime('/lorem.txt');
@@ -203,11 +203,11 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
clearstatcache();
$mtimeEnd = time();
$mTime = $this->instance->filemtime('/lorem.txt');
- $this->assertTrue(($mtimeStart - 1) <= $mTime);
- $this->assertTrue($mTime <= ($mtimeEnd + 1));
+ $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() {