Merge branch '2.4.x'

Closes gh-25574

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/r2dbc/ConnectionPoolMetricsTests.java

@@ -59,7 +59,7 @@ class ConnectionPoolMetricsTests {
 	@AfterEach
 	void close() {
 		if (this.connectionFactory != null) {
-			this.connectionFactory.close();
+			StepVerifier.create(this.connectionFactory.close()).verifyComplete();
 		}
 	}
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/r2dbc/ConnectionFactoryHealthIndicatorTests.java

@@ -59,7 +59,7 @@ class ConnectionFactoryHealthIndicatorTests {
 			}).verifyComplete();
 		}
 		finally {
-			connectionFactory.close();
+			StepVerifier.create(connectionFactory.close()).verifyComplete();
 		}
 	}
 
@@ -110,7 +110,7 @@ class ConnectionFactoryHealthIndicatorTests {
 			}).verifyComplete();
 		}
 		finally {
-			connectionFactory.close();
+			StepVerifier.create(connectionFactory.close()).verifyComplete();
 		}
 
 	}
@@ -130,7 +130,7 @@ class ConnectionFactoryHealthIndicatorTests {
 			}).verifyComplete();
 		}
 		finally {
-			connectionFactory.close();
+			StepVerifier.create(connectionFactory.close()).verifyComplete();
 		}
 	}