From f5b62fb2eb10f23109bf1b1e8a3a6d0c8b0c67e4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 6 Oct 2012 13:45:46 +0200 Subject: [PATCH] skip some test for storage backends that don't support touch --- tests/lib/filestorage.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php index 3f7bb7b62d..101da0d1ad 100644 --- a/tests/lib/filestorage.php +++ b/tests/lib/filestorage.php @@ -176,22 +176,24 @@ abstract class Test_FileStorage extends UnitTestCase { $this->assertEqual($stat['ctime'],$cTime); $mtimeStart=time(); - $this->instance->touch('/lorem.txt'); + $supportsTouch = $this->instance->touch('/lorem.txt'); $mtimeEnd=time(); - $originalCTime=$cTime; - $cTime=$this->instance->filectime('/lorem.txt'); - $mTime=$this->instance->filemtime('/lorem.txt'); - $this->assertTrue(($mtimeStart-1)<=$mTime); - $this->assertTrue($mTime<=($mtimeEnd+1)); - $this->assertEqual($cTime,$originalCTime); - - $this->assertTrue($this->instance->hasUpdated('/lorem.txt',$mtimeStart-1)); - - if($this->instance->touch('/lorem.txt',100)!==false) { + if($supportsTouch !== false){ + $originalCTime=$cTime; + $cTime=$this->instance->filectime('/lorem.txt'); $mTime=$this->instance->filemtime('/lorem.txt'); - $this->assertEqual($mTime,100); + $this->assertTrue(($mtimeStart-1)<=$mTime); + $this->assertTrue($mTime<=($mtimeEnd+1)); + $this->assertEqual($cTime,$originalCTime); + + $this->assertTrue($this->instance->hasUpdated('/lorem.txt',$mtimeStart-1)); + + if($this->instance->touch('/lorem.txt',100)!==false) { + $mTime=$this->instance->filemtime('/lorem.txt'); + $this->assertEqual($mTime,100); + } } - + $mtimeStart=time(); $fh=$this->instance->fopen('/lorem.txt','a'); fwrite($fh,' ');