Add tests for FlockMutex timeout conditions.

Author: willemstuursma

classes/mutex/FlockMutex.php

@@ -51,11 +51,6 @@ class FlockMutex extends LockMutex
      */
     private $strategy;
 
-    /**
-     * @var float|null
-     */
-    private $acquired;
-
     /**
      * Sets the file handle.
      *
@@ -118,7 +113,6 @@ private function lockBusy()
         $loop = new Loop($this->timeout);
         $loop->execute(function () use ($loop) {
             if ($this->acquireNonBlockingLock()) {
-                $this->acquired = \microtime(true);
                 $loop->end();
             }
         });
@@ -165,19 +159,11 @@ protected function lock()
 
     /**
      * @throws LockReleaseException
-     * @throws ExecutionOutsideLockException
      */
     protected function unlock()
     {
         if (!flock($this->fileHandle, LOCK_UN)) {
             throw new LockReleaseException("Failed to unlock the file.");
         }
-
-        if ($this->acquired !== null) {
-            $elapsed_time = \microtime(true) - $this->acquired;
-            if ($elapsed_time > $this->timeout) {
-                throw ExecutionOutsideLockException::create($elapsed_time, $this->timeout);
-            }
-        }
     }
 }

tests/mutex/CASMutexTest.php

@@ -2,8 +2,8 @@
 
 namespace malkusch\lock\mutex;
 
-use phpmock\phpunit\PHPMock;
 use phpmock\environment\SleepEnvironmentBuilder;
+use phpmock\phpunit\PHPMock;
 
 /**
  * Tests for CASMutex.

tests/mutex/FlockMutexTest.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace malkusch\lock\mutex;
+
+use Eloquent\Liberator\Liberator;
+
+/**
+ * @author Willem Stuursma-Ruwen <[email protected]>
+ * @link bitcoin:1P5FAZ4QhXCuwYPnLZdk3PJsqePbu1UDDA Donations
+ * @license WTFPL
+ * @see CASMutex
+ */
+class FlockMutexTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var FlockMutex
+     */
+    private $mutex;
+
+    /**
+     * @var resource
+     */
+    private $file;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->file = tempnam(sys_get_temp_dir(), "flock-");
+        $this->mutex = Liberator::liberate(new FlockMutex(fopen($this->file, "r"), 1));
+    }
+
+    protected function tearDown()
+    {
+        unlink($this->file);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider dpTimeoutableStrategies
+     */
+    public function testCodeExecutedOutsideLockIsNotThrown($strategy)
+    {
+        $this->mutex->strategy = $strategy;
+
+        $this->assertTrue($this->mutex->synchronized(function () {
+            usleep(1.1e6);
+            return true;
+        }));
+    }
+
+    /**
+     * @expectedException \malkusch\lock\exception\TimeoutException
+     * @dataProvider dpTimeoutableStrategies
+     */
+    public function testTimeoutOccurs($strategy)
+    {
+        $another_resource = fopen($this->file, "r");
+        flock($another_resource, LOCK_EX);
+
+        $this->mutex->strategy = $strategy;
+
+        try {
+            $this->mutex->synchronized(
+                function () {
+                    $this->fail("Did not expect code to be executed");
+                }
+            );
+        } finally {
+            fclose($another_resource);
+        }
+    }
+
+    public function dpTimeoutableStrategies()
+    {
+        return [
+            [FlockMutex::STRATEGY_PCNTL],
+            [FlockMutex::STRATEGY_BUSY],
+        ];
+    }
+}

tests/mutex/MutexConcurrencyTest.php

@@ -3,9 +3,9 @@
 namespace malkusch\lock\mutex;
 
 use Eloquent\Liberator\Liberator;
+use ezcSystemInfo;
 use Predis\Client;
 use Redis;
-use ezcSystemInfo;
 use Spork\ProcessManager;
 
 /**

tests/mutex/MutexTest.php

@@ -3,11 +3,10 @@
 namespace malkusch\lock\mutex;
 
 use Eloquent\Liberator\Liberator;
+use Memcached;
 use org\bovigo\vfs\vfsStream;
 use Predis\Client;
 use Redis;
-use Memcached;
-use Spork\ProcessManager;
 
 /**
  * Tests for Mutex.

tests/mutex/PgAdvisoryLockMutexTest.php

@@ -2,9 +2,6 @@
 
 namespace malkusch\lock\mutex;
 
-use malkusch\lock\exception\LockAcquireException;
-use malkusch\lock\exception\LockReleaseException;
-
 /**
  * @author Willem Stuursma-Ruwen <[email protected]>
  * @link bitcoin:1P5FAZ4QhXCuwYPnLZdk3PJsqePbu1UDDA Donations

tests/mutex/RedisMutexTest.php

@@ -4,10 +4,8 @@
 
 use malkusch\lock\exception\LockAcquireException;
 use malkusch\lock\exception\LockReleaseException;
-use phpmock\phpunit\PHPMock;
 use phpmock\environment\SleepEnvironmentBuilder;
-use Spork\ProcessManager;
-use Spork\Fork;
+use phpmock\phpunit\PHPMock;
 
 /**
  * Tests for RedisMutex.

tests/util/LoopTest.php

@@ -2,8 +2,8 @@
 
 namespace malkusch\lock\util;
 
-use phpmock\phpunit\PHPMock;
 use phpmock\environment\SleepEnvironmentBuilder;
+use phpmock\phpunit\PHPMock;
 
 /**
  * Tests for Loop.