minor #23847 [Lock] Fix/lock test (jderusse)

fabpot · fabpot · commit 334b62acd05d · 2017-08-10T09:13:20.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Lock] Fix/lock test | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A Test on the Lock component often fail, the purpose of this PR is to fix it. The goal of this failling test is to assert that blocking locks works. To test the blocking mode, I had to create 2 concurent process and I used pcntl_fork for that. Sadly, travis takes more time to fork the process than configured TTL. This PR replace the previous "sleep" to let child and parent starts, by a pcntl communication between child and parent. | Process 1 | Process 2 | ----------------------- | ---------- | Wait N°2 | | | Acquire Lock | | Send signal to N°1 | Wake up | Wait N°1 | Try lock(non block) | | => assert failure | | Send signal to N°2 | | lock(block) | Wake up | .. | sleep 50 000ms | .. | .. | .. | Release lock | => assert Acquired | exit | Release lock | | => assert child exit 0 | Commits ------- ff95169 Fix lock failling test
diff --git a/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
@@ -35,7 +35,7 @@ abstract protected function getStore();
     public function testBlockingLocks()
     {
         // Amount a microsecond used to order async actions
-        $clockDelay = 200000;
+        $clockDelay = 50000;
 
         if (\PHP_VERSION_ID < 50600 || defined('HHVM_VERSION_ID')) {
             $this->markTestSkipped('The PHP engine does not keep resource in child forks');
@@ -46,31 +46,46 @@ public function testBlockingLocks()
         /** @var StoreInterface $store */
         $store = $this->getStore();
         $key = new Key(uniqid(__METHOD__, true));
+        $parentPID = posix_getpid();
 
-        if ($childPID1 = pcntl_fork()) {
-            // give time to fork to start
-            usleep(1 * $clockDelay);
+        // Block SIGHUP signal
+        pcntl_sigprocmask(SIG_BLOCK, array(SIGHUP));
+
+        if ($childPID = pcntl_fork()) {
+            // Wait the start of the child
+            pcntl_sigwaitinfo(array(SIGHUP), $info);
 
             try {
-                // This call should failed given the lock should already by acquired by the child #1
+                // This call should failed given the lock should already by acquired by the child
                 $store->save($key);
                 $this->fail('The store saves a locked key.');
             } catch (LockConflictedException $e) {
             }
 
+            // send the ready signal to the child
+            posix_kill($childPID, SIGHUP);
+
             // This call should be blocked by the child #1
             $store->waitAndSave($key);
             $this->assertTrue($store->exists($key));
             $store->delete($key);
 
             // Now, assert the child process worked well
-            pcntl_waitpid($childPID1, $status1);
+            pcntl_waitpid($childPID, $status1);
             $this->assertSame(0, pcntl_wexitstatus($status1), 'The child process couldn\'t lock the resource');
         } else {
+            // Block SIGHUP signal
+            pcntl_sigprocmask(SIG_BLOCK, array(SIGHUP));
             try {
                 $store->save($key);
-                // Wait 2 ClockDelay to let parent process to finish
-                usleep(2 * $clockDelay);
+                // send the ready signal to the parent
+                posix_kill($parentPID, SIGHUP);
+
+                // Wait for the parent to be ready
+                pcntl_sigwaitinfo(array(SIGHUP), $info);
+
+                // Wait ClockDelay to let parent assert to finish
+                usleep($clockDelay);
                 $store->delete($key);
                 exit(0);
             } catch (\Exception $e) {
