commit e6ffd8e213b940dc332d657f618b4941fa7dea33
author Michael Martell <mmartell@pivotal.io> Thu Sep 10 16:14:40 2020 -0700
committer GitHub <noreply@github.com> Thu Sep 10 16:14:40 2020 -0700
tree dddb10c333745da9ad22ff8b3873d60dc8384033
parent 2c0a66723962873002f60302431436d4603c71c2

GEODE-8449: Cleanup containers before each test (#649)

* Cleanup containers before each test
- in case a test fails to cleanup

* Cleanup test structure per review.

clicache/acceptance-test/SNITests.cs

diff --git a/clicache/acceptance-test/SNITests.cs b/clicache/acceptance-test/SNITests.cs
index cb20f31..f459716 100644
--- a/clicache/acceptance-test/SNITests.cs
+++ b/clicache/acceptance-test/SNITests.cs
@@ -34,6 +34,8 @@
 
         public SNITests(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
         {
+			CleanupDocker();
+
             currentWorkingDirectory = Directory.GetCurrentDirectory();
             var clientTruststore = Config.SslClientKeyPath + @"/truststore_sni.pem";
 
@@ -56,14 +58,17 @@
 
         public void Dispose()
         {
+			CleanupDocker();
+		}
 
-            var dockerComposeProc = Process.Start(@"docker-compose.exe", "-f " + Config.SniConfigPath + "/docker-compose.yml" + " stop");
-            dockerComposeProc.WaitForExit();
+		private void CleanupDocker()
+		{
+			var dockerComposeProc = Process.Start(@"docker-compose.exe", "-f " + Config.SniConfigPath + "/docker-compose.yml" + " stop");
+			dockerComposeProc.WaitForExit();
 
-            var dockerProc = Process.Start(@"docker.exe", "system prune -f");
-            dockerProc.WaitForExit();
-
-        }
+			var dockerProc = Process.Start(@"docker.exe", "system prune -f");
+			dockerProc.WaitForExit();
+		}
 
         private string RunDockerCommand(string dockerCommand)
         {

cppcache/acceptance-test/SNITest.cpp

diff --git a/cppcache/acceptance-test/SNITest.cpp b/cppcache/acceptance-test/SNITest.cpp
index 46b9d1c..3475227 100644
--- a/cppcache/acceptance-test/SNITest.cpp
+++ b/cppcache/acceptance-test/SNITest.cpp
@@ -52,6 +52,8 @@
   ~SNITest() override = default;
 
   void SetUp() override {
+    TearDown();
+
     auto systemRVal = 0;
     std::string dockerComposeCmd = "docker-compose -f " +
                                    sniConfigPath.string() +
@@ -74,7 +76,9 @@
     }
   }
 
-  void TearDown() override {
+  void TearDown() override { cleanupDocker(); }
+
+  void cleanupDocker() {
     auto dockerComposeStopCommand = "docker-compose -f " +
                                     sniConfigPath.string() +
                                     "/docker-compose.yml" + " stop";