wip resolving testkit tests

Author: p123-stack

docker-compose.yml

@@ -67,7 +67,6 @@ services:
       NEO4J_server_http_advertised__address: neo4j:7474
 
 
-
   server1:
     <<: *common-cluster
     hostname: server1
@@ -141,6 +140,7 @@ services:
       - neo4j
     extra_hosts:
       - "host.docker.internal:host-gateway"
+      - "thehost:host-gateway"
     depends_on:
       - neo4j
     ports:

src/Bolt/ConnectionPool.php

@@ -13,6 +13,7 @@
 
 namespace Laudis\Neo4j\Bolt;
 
+use Bolt\error\ConnectionTimeoutException;
 use Generator;
 use Laudis\Neo4j\BoltFactory;
 use Laudis\Neo4j\Common\Neo4jLogger;
@@ -24,6 +25,7 @@
 use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Databags\SessionConfiguration;
 use Laudis\Neo4j\Exception\ConnectionPoolException;
+use Laudis\Neo4j\Exception\TimeoutException;
 use Psr\Http\Message\UriInterface;
 
 use function shuffle;
@@ -42,6 +44,7 @@ public function __construct(
         private readonly ConnectionRequestData $data,
         private readonly ?Neo4jLogger $logger,
         private readonly float $acquireConnectionTimeout,
+        private readonly float $connectionTimeout,
     ) {
     }
 
@@ -62,7 +65,8 @@ public static function create(
                 $conf->getSslConfiguration()
             ),
             $conf->getLogger(),
-            $conf->getAcquireConnectionTimeout()
+            $conf->getAcquireConnectionTimeout(),
+            $conf->getConnectionTimeout()
         );
     }
 
@@ -101,11 +105,14 @@ public function acquire(SessionConfiguration $config): Generator
                 return $connection;
             }
 
-            $connection = $this->factory->createConnection($this->data, $config);
+            try {
+                $connection = $this->factory->createConnection($this->data, $config, $this->connectionTimeout);
 
-            $this->activeConnections[] = $connection;
-
-            return $connection;
+                $this->activeConnections[] = $connection;
+                return $connection;
+            } catch (ConnectionTimeoutException $e) {
+                throw new TimeoutException($e->getMessage(), $e->getCode(), $e);
+            }
         })();
     }
 

src/BoltFactory.php

@@ -25,7 +25,6 @@
 use Laudis\Neo4j\Databags\ConnectionRequestData;
 use Laudis\Neo4j\Databags\DatabaseInfo;
 use Laudis\Neo4j\Databags\SessionConfiguration;
-use Laudis\Neo4j\Databags\TransactionConfiguration;
 use Laudis\Neo4j\Enum\ConnectionProtocol;
 
 /**
@@ -49,7 +48,7 @@ public static function create(?Neo4jLogger $logger): self
         return new self(SystemWideConnectionFactory::getInstance(), new ProtocolFactory(), new SslConfigurationFactory(), $logger);
     }
 
-    public function createConnection(ConnectionRequestData $data, SessionConfiguration $sessionConfig): BoltConnection
+    public function createConnection(ConnectionRequestData $data, SessionConfiguration $sessionConfig, float $connectionTimeout): BoltConnection
     {
         [$sslLevel, $sslConfig] = $this->sslConfigurationFactory->create($data->getUri()->withHost($data->getHostname()), $data->getSslConfig());
 
@@ -58,7 +57,7 @@ public function createConnection(ConnectionRequestData $data, SessionConfigurati
             $data->getUri()->getPort(),
             $sslLevel,
             $sslConfig,
-            TransactionConfiguration::DEFAULT_TIMEOUT
+            $connectionTimeout
         );
 
         $connection = $this->connectionFactory->create($uriConfig);

src/Databags/DriverConfiguration.php

@@ -38,7 +38,9 @@ final class DriverConfiguration
     public const DEFAULT_USER_AGENT = 'neo4j-php-client/%s';
     public const DEFAULT_POOL_SIZE = 0x2F;
     public const DEFAULT_CACHE_IMPLEMENTATION = Cache::class;
-    public const DEFAULT_ACQUIRE_CONNECTION_TIMEOUT = 2.0;
+    public const DEFAULT_ACQUIRE_CONNECTION_TIMEOUT = 60.0;
+    public const DEFAULT_CONNECTION_TIMEOUT = 30.0;
+
     /** @var callable():(CacheInterface|null)|CacheInterface|null */
     private $cache;
     /** @var callable():(SemaphoreFactoryInterface|null)|SemaphoreFactoryInterface|null */
@@ -58,6 +60,7 @@ public function __construct(
         private ?int $maxPoolSize,
         CacheInterface|callable|null $cache,
         private ?float $acquireConnectionTimeout,
+        private ?float $connectionTimeout,
         callable|SemaphoreFactoryInterface|null $semaphore,
         ?string $logLevel,
         ?LoggerInterface $logger,
@@ -80,6 +83,7 @@ public static function create(
         int $maxPoolSize,
         CacheInterface $cache,
         float $acquireConnectionTimeout,
+        float $connectionTimeout,
         SemaphoreFactoryInterface $semaphore,
         ?string $logLevel,
         ?LoggerInterface $logger,
@@ -90,6 +94,7 @@ public static function create(
             $maxPoolSize,
             $cache,
             $acquireConnectionTimeout,
+            $connectionTimeout,
             $semaphore,
             $logLevel,
             $logger
@@ -112,6 +117,7 @@ public static function default(): self
             null,
             null,
             null,
+            null,
             null
         );
     }
@@ -233,6 +239,25 @@ public function withAcquireConnectionTimeout(?float $acquireConnectionTimeout):
         return $tbr;
     }
 
+    /**
+     * @psalm-immutable
+     */
+    public function getConnectionTimeout(): float
+    {
+        return $this->connectionTimeout ??= self::DEFAULT_CONNECTION_TIMEOUT;
+    }
+
+    /**
+     * @psalm-immutable
+     */
+    public function withConnectionTimeout(?float $connectionTimeout): self
+    {
+        $tbr = clone $this;
+        $tbr->connectionTimeout = $connectionTimeout;
+
+        return $tbr;
+    }
+
     /**
      * @param callable():(SemaphoreFactoryInterface|null)|SemaphoreFactoryInterface|null $factory
      *

src/Exception/TimeoutException.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Laudis\Neo4j\Exception;
+
+use RuntimeException;
+
+class TimeoutException extends RuntimeException
+{
+
+}

src/Neo4j/Neo4jConnectionPool.php

@@ -75,6 +75,7 @@ public function __construct(
         private readonly AddressResolverInterface $resolver,
         private readonly ?Neo4jLogger $logger,
         private readonly float $acquireConnectionTimeout,
+        private readonly float $connectionTimeout,
     ) {
     }
 
@@ -98,7 +99,8 @@ public static function create(
             Cache::getInstance(),
             $resolver,
             $conf->getLogger(),
-            $conf->getAcquireConnectionTimeout()
+            $conf->getAcquireConnectionTimeout(),
+            $conf->getConnectionTimeout()
         );
     }
 
@@ -114,7 +116,7 @@ public function createOrGetPool(string $hostname, UriInterface $uri): Connection
 
         $key = $this->createKey($data);
         if (!array_key_exists($key, self::$pools)) {
-            self::$pools[$key] = new ConnectionPool($this->semaphore, $this->factory, $data, $this->logger, $this->acquireConnectionTimeout);
+            self::$pools[$key] = new ConnectionPool($this->semaphore, $this->factory, $data, $this->logger, $this->acquireConnectionTimeout, $this->connectionTimeout);
         }
 
         return self::$pools[$key];

testkit-backend/testkit.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 TESTKIT_VERSION=5.0
 
 [ -z "$TEST_NEO4J_HOST" ] && export TEST_NEO4J_HOST=neo4j
@@ -32,16 +34,40 @@ python3 -m venv venv
 source venv/bin/activate
 pip install -r requirements.txt
 
+if [ ! -f ./tlsserver/tlsserver ]; then
+    (cd ./tlsserver && go build -o tlsserver main.go)
+fi
+
+CERT_DIR=$(realpath ./tests/tls)
+(cd certgen && go run main.go "${CERT_DIR}")
+
 # python3 main.py --tests UNIT_TESTS
 
 echo "Starting tests..."
 
-python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic
-python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks
-python3 -m unittest tests.neo4j.test_session_run.TestSessionRun
-python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver
-python3 -m unittest tests.neo4j.test_summary.TestSummary
-python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun
-python3 -m unittest tests.neo4j.test_tx_run.TestTxRun
+#python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic
+#python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks
+#python3 -m unittest tests.neo4j.test_session_run.TestSessionRun
+#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver
+#python3 -m unittest tests.neo4j.test_summary.TestSummary
+python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_timeout
+#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun
 
+#tlstest_secure_server
 
+#python3 -m unittest tests.tls.test_client_certificate.TestClientCertificate
+#python3 -m unittest tests.tls.test_client_certificate.TestClientCertificateRotation
+#
+#python3 -m unittest tests.tls.test_explicit_options.TestExplicitSslOptions
+#
+#python3 -m unittest tests.tls.test_secure_scheme.TestSecureScheme
+#python3 -m unittest tests.tls.test_secure_scheme.TestTrustSystemCertsConfig
+#python3 -m unittest tests.tls.test_secure_scheme.TestTrustCustomCertsConfig
+#
+#
+#python3 -m unittest tests.tls.test_self_signed_scheme.TestSelfSignedScheme
+#python3 -m unittest tests.tls.test_self_signed_scheme.TestTrustAllCertsConfig
+#
+#python3 -m unittest tests.tls.test_tls_versions.TestTlsVersions
+#
+#python3 -m unittest tests.tls.test_unsecure_scheme.TestUnsecureScheme.test_secure_server #2 error

tests/Integration/BoltResultIntegrationTest.php

@@ -20,6 +20,7 @@
 use Laudis\Neo4j\Bolt\SystemWideConnectionFactory;
 use Laudis\Neo4j\BoltFactory;
 use Laudis\Neo4j\Databags\ConnectionRequestData;
+use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Databags\SessionConfiguration;
 use Laudis\Neo4j\Databags\SslConfiguration;
 use Laudis\Neo4j\Enum\SslMode;
@@ -41,7 +42,7 @@ public function testIterationLong(): void
         );
         $connection = $factory->createConnection(
             new ConnectionRequestData($this->getUri()->getHost(), $this->getUri(), Authenticate::fromUrl($this->getUri()), 'a/b', new SslConfiguration(SslMode::FROM_URL(), false)),
-            SessionConfiguration::default()
+            SessionConfiguration::default(),DriverConfiguration::DEFAULT_CONNECTION_TIMEOUT
         );
 
         $connection->protocol()->run('UNWIND range(1, 100000) AS i RETURN i')

tests/Integration/ClientBuilderTest.php

@@ -35,6 +35,7 @@ public function testGetClient(): void
             ->withSslConfiguration($sslConfig)
             ->withMaxPoolSize(4096)
             ->withAcquireConnectionTimeout(2.5)
+            ->withConnectionTimeout(76)
         ->withLogger(LogLevel::DEBUG, $logger);
         $sessionConfig = SessionConfiguration::default()->withDatabase('neo4j');
         $transactionConfig = TransactionConfiguration::default()->withTimeout(120.0);

tests/Integration/ClientIntegrationTest.php

@@ -13,6 +13,7 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use Bolt\error\ConnectionTimeoutException;
 use Exception;
 use InvalidArgumentException;
 use Laudis\Neo4j\Authentication\Authenticate;
@@ -359,4 +360,35 @@ public function testRedundantAcquire(): void
             $this->assertCount(1, $activeConnections);
         }
     }
+
+    public function testTimeoutExceptionIsThrown(): void
+    {
+        $factory = $this->createMock(BoltFactory::class);
+        $semaphore = $this->createMock(SemaphoreInterface::class);
+        $data = $this->createMock(ConnectionRequestData::class);
+        $logger = $this->createMock(Neo4jLogger::class);
+        $config = SessionConfiguration::default();
+
+        $factory->method('createConnection')
+            ->willThrowException(new ConnectionTimeoutException('Connection timed out'));
+
+        $semaphore->method('wait')->willReturn((function () {
+            if (false) yield;
+        })());
+
+        $pool = new ConnectionPool(
+            $semaphore,
+            $factory,
+            $data,
+            $logger,
+            5.0,
+            2.0
+        );
+
+        $this->expectException(TimeoutException::class);
+        $this->expectExceptionMessage('Connection timed out');
+
+        iterator_to_array($pool->acquire($config));
+    }
+
 }