fixed test

Author: Mikhail Galanin

sapi/fpm/tests/listen-socket-closed-on-exec.phpt

@@ -24,21 +24,31 @@ pm.status_path = /status
 env[PATH] = $PATH
 EOT;
 
-
 $code = <<<'EOT'
 <?php
 
-echo "My sockets (expect to see 2 of them):\n";
+$fpmPort = $_GET['fpm_port'];
+
+echo "My sockets (expect to see 2 of them - one ESTABLISHED and one LISTEN):\n";
 
 $mypid = getmypid();
-$ph = popen("/bin/sh -c 'lsof -Pn -p$mypid' 2>&1 | grep TCP", 'r');
+$ph = popen("/bin/sh -c 'lsof -Pn -p$mypid' 2>&1 | grep TCP | grep '127.0.0.1:$fpmPort'", 'r');
 echo stream_get_contents($ph);
 pclose($ph);
 
 echo "\n\n";
 
+/*
+We expect that both LISTEN (inherited from the master process) and ACCEPTED (ESTABLISHED)
+have F_CLOEXEC and should not appear in the created process.
+
+We grep out sockets from non-FPM port, because they may appear in the environment,
+e.g. PHP-FPM can inherit them from the test-runner. We cannot control the runner
+but we test how the FPM behaves.
+*/
+
 echo "Sockets after exec(), expected to be empty:\n";
-$ph = popen("/bin/sh -c 'lsof -Pn -p\$\$' 2>&1 | grep TCP", 'r');
+$ph = popen("/bin/sh -c 'lsof -Pn -p\$\$' 2>&1 | grep TCP | grep '127.0.0.1:$fpmPort'", 'r');
 var_dump(stream_get_contents($ph));
 pclose($ph);
 
@@ -47,7 +57,7 @@ EOT;
 $tester = new FPM\Tester($cfg, $code);
 $tester->start();
 $tester->expectLogStartNotices();
-$tester->request()->printBody();
+$tester->request(query: 'fpm_port='.$tester->getPort())->printBody();
 usleep(100000);
 //$tester->status($expectedStatusData, '{{ADDR[status]}}');
 $tester->terminate();
@@ -57,7 +67,9 @@ $tester->close();
 ?>
 Done
 --EXPECTF--
-My sockets (expect to see 2 of them):
+My sockets (expect to see 2 of them - one ESTABLISHED and one LISTEN):
+%S 127.0.0.1:%d->127.0.0.1:%d (ESTABLISHED)
+%S 127.0.0.1:%d (LISTEN)
 
 
 Sockets after exec(), expected to be empty: