]> source.dussan.org Git - nextcloud-server.git/commitdiff
loosen tests for mtime and ctime a bit
authorRobin Appelman <icewind@owncloud.com>
Thu, 22 Mar 2012 18:54:24 +0000 (19:54 +0100)
committerRobin Appelman <icewind@owncloud.com>
Thu, 22 Mar 2012 18:54:24 +0000 (19:54 +0100)
tests/lib/filestorage.php

index 9ffa0eca9cb0e2e7bf9928480429ffb41aac36b7..4858234a2d863d247f6f3b0b65661abd64f464b2 100644 (file)
@@ -135,10 +135,12 @@ abstract class Test_FileStorage extends UnitTestCase {
                $ctimeEnd=time();
                $cTime=$this->instance->filectime('/lorem.txt');
                $mTime=$this->instance->filemtime('/lorem.txt');
-               $this->assertTrue($ctimeStart<=$cTime);
-               $this->assertTrue($cTime<=$ctimeEnd);
-               $this->assertTrue($ctimeStart<=$mTime);
-               $this->assertTrue($mTime<=$ctimeEnd);
+               if($cTime!=-1){//not everything can support ctime
+                       $this->assertTrue(($ctimeStart-1)<=$cTime);
+                       $this->assertTrue($cTime<=($ctimeEnd+1));
+               }
+               $this->assertTrue(($ctimeStart-1)<=$mTime);
+               $this->assertTrue($mTime<=($ctimeEnd+1));
                $this->assertEqual(filesize($textFile),$this->instance->filesize('/lorem.txt'));
                
                $stat=$this->instance->stat('/lorem.txt');
@@ -153,8 +155,8 @@ abstract class Test_FileStorage extends UnitTestCase {
                $originalCTime=$cTime;
                $cTime=$this->instance->filectime('/lorem.txt');
                $mTime=$this->instance->filemtime('/lorem.txt');
-               $this->assertTrue($mtimeStart<=$mTime);
-               $this->assertTrue($mTime<=$mtimeEnd);
+               $this->assertTrue(($mtimeStart-1)<=$mTime);
+               $this->assertTrue($mTime<=($mtimeEnd+1));
                $this->assertEqual($cTime,$originalCTime);
                
                if($this->instance->touch('/lorem.txt',100)!==false){
@@ -170,8 +172,8 @@ abstract class Test_FileStorage extends UnitTestCase {
                $mtimeEnd=time();
                $originalCTime=$cTime;
                $mTime=$this->instance->filemtime('/lorem.txt');
-               $this->assertTrue($mtimeStart<=$mTime);
-               $this->assertTrue($mTime<=$mtimeEnd);
+               $this->assertTrue(($mtimeStart-1)<=$mTime);
+               $this->assertTrue($mTime<=($mtimeEnd+1));
        }
 
        public function testSearch(){