CI: fix ITs not always closing driver (#628)

Author: robsdedude

neo4j/test-integration/dbserver/dbserver.go

@@ -118,6 +118,7 @@ func setServerVersion(ctx context.Context, server *DbServer, envVersion Version)
 // this is used when the TEST_NEO4J_VERSION environment variable is not set.
 func (s *DbServer) getVersionFromDB(ctx context.Context) (Version, error) {
 	driver := s.Driver()
+	defer func() { _ = driver.Close(ctx) }()
 	session := driver.NewSession(ctx, neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead})
 	defer session.Close(ctx)
 
@@ -146,6 +147,7 @@ func (s *DbServer) getVersionFromDB(ctx context.Context) (Version, error) {
 
 func (s DbServer) deleteData(ctx context.Context) {
 	driver := s.Driver()
+	defer func() { _ = driver.Close(ctx) }()
 	session := driver.NewSession(ctx, neo4j.SessionConfig{AccessMode: neo4j.AccessModeWrite})
 	defer session.Close(ctx)
 

neo4j/test-integration/routing_test.go

@@ -74,6 +74,7 @@ func TestRouting(outer *testing.T) {
 
 		driver := getDriver(server.URI())
 		assertNil(t, err)
+		defer func() { _ = driver.Close(ctx) }()
 
 		session = driver.NewSession(ctx, neo4j.SessionConfig{AccessMode: neo4j.AccessModeWrite})
 

neo4j/test-integration/session_test.go

@@ -50,19 +50,11 @@ func TestSession(outer *testing.T) {
 			c.Log = log.ToConsole(log.DEBUG)
 		})
 		assertNotNil(inner, driver)
+		defer func() { _ = driver.Close(ctx) }()
 
 		session = driver.NewSession(ctx, neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead})
 		assertNotNil(inner, session)
-
-		defer func() {
-			if session != nil {
-				session.Close(ctx)
-			}
-
-			if driver != nil {
-				driver.Close(ctx)
-			}
-		}()
+		defer func() { _ = session.Close(ctx) }()
 
 		inner.Run("when a query is executed, it should run and return summary with correct statement", func(t *testing.T) {
 			stmt := "UNWIND [1, 2, 3, 4, 5] AS x RETURN x"

neo4j/test-integration/summary_test.go

@@ -44,6 +44,7 @@ func TestResultSummary(outer *testing.T) {
 		config.Log = log.ToConsole(log.DEBUG)
 	})
 	assertNotNil(outer, driver)
+	defer func() { _ = driver.Close(ctx) }()
 
 	outer.Run("from single-tenant Neo4j servers", func(inner *testing.T) {
 		if isMultiTenant(server) {

neo4j/test-integration/types_test.go

@@ -41,18 +41,10 @@ func TestTypes(outer *testing.T) {
 	var result neo4j.ResultWithContext
 
 	driver = server.Driver()
+	defer func() { _ = driver.Close(ctx) }()
 	session = driver.NewSession(ctx, neo4j.SessionConfig{AccessMode: neo4j.AccessModeWrite})
 	assertNotNil(outer, session)
-
-	defer func() {
-		if session != nil {
-			session.Close(ctx)
-		}
-
-		if driver != nil {
-			driver.Close(ctx)
-		}
-	}()
+	defer func() { _ = session.Close(ctx) }()
 
 	outer.Run("should be able to send and receive boolean property", func(t *testing.T) {
 		value := true