Add detailed logs to TestEnvironmentConfig cleanup (#342)

Author: congoamz

tests/integration/container/conftest.py

@@ -14,6 +14,7 @@
 
 from __future__ import annotations
 
+import atexit
 from typing import TYPE_CHECKING
 
 from aws_advanced_python_wrapper.connection_provider import \
@@ -136,3 +137,10 @@ def pytest_sessionstart(session):
 def pytest_sessionfinish(session, exitstatus):
     # Enable all connectivity in case any helper threads are still trying to execute against a disabled host
     ProxyHelper.enable_all_connectivity()
+
+
+def log_exit():
+    print("Python program is exiting...")
+
+
+atexit.register(log_exit)

tests/integration/host/src/test/java/integration/host/TestEnvironmentConfig.java

@@ -664,9 +664,12 @@ public void debugTests(String folderName) throws IOException, InterruptedExcepti
 
   @Override
   public void close() {
+    LOGGER.info("[TestEnvironmentConfig] close() was called");
     if (this.databaseContainers != null) {
+      LOGGER.info("[TestEnvironmentConfig] this.databaseContainers was not null");
       for (GenericContainer<?> container : this.databaseContainers) {
         try {
+          LOGGER.info("[TestEnvironmentConfig] stopping container...");
           container.stop();
         } catch (Exception ex) {
           // ignore
@@ -676,12 +679,15 @@ public void close() {
     }
 
     if (this.testContainer != null) {
+      LOGGER.info("[TestEnvironmentConfig] stopping test container...");
       this.testContainer.stop();
       this.testContainer = null;
     }
 
     if (this.proxyContainers != null) {
+      LOGGER.info("[TestEnvironmentConfig] this.proxyContainers not null");
       for (ToxiproxyContainer proxyContainer : this.proxyContainers) {
+        LOGGER.info("[TestEnvironmentConfig] stopping proxy container...");
         proxyContainer.stop();
       }
       this.proxyContainers = null;
@@ -695,6 +701,7 @@ public void close() {
       case RDS:
         throw new NotImplementedException(this.info.getRequest().getDatabaseEngineDeployment().toString());
       default:
+        LOGGER.info("[TestEnvironmentConfig] default switch branch was hit inside close()");
         // do nothing
     }
   }
@@ -709,14 +716,20 @@ public String getPrimaryInfo() {
   }
 
   private void deleteDbCluster() {
+    LOGGER.info("[TestEnvironmentConfig] deleteDbCluster() was called");
+    LOGGER.info("[TestEnvironmentConfig] reuseDbCluster value: " + this.reuseDbCluster);
     if (!this.reuseDbCluster && !StringUtils.isNullOrEmpty(this.runnerIP)) {
+      LOGGER.info("[TestEnvironmentConfig] deauthorizing IP...");
       rdsUtil.ec2DeauthorizesIP(runnerIP);
     }
 
     if (!this.reuseDbCluster) {
+      LOGGER.info("[TestEnvironmentConfig] deleting cluster...");
       LOGGER.finest("Deleting cluster " + this.clusterName + ".cluster-" + this.clusterDomain);
       rdsUtil.deleteCluster(this.clusterName);
       LOGGER.finest("Deleted cluster " + this.clusterName + ".cluster-" + this.clusterDomain);
+    } else {
+      LOGGER.info("[TestEnvironmentConfig] The reuseDbCluster branch was hit in deleteDbCluster");
     }
   }
 }