destroy domain after tests

sankarpn · sankarpn · commit a8273cc7d269 · 2019-04-29T16:39:32.000-07:00
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITMultipleClusters.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITMultipleClusters.java
@@ -128,7 +128,9 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
             Paths.get(template + ".org"), Paths.get(template), StandardCopyOption.REPLACE_EXISTING);
         Files.delete(Paths.get(template + ".org"));
       }
-      domain.shutdownUsingServerStartPolicy();
+      if (domain != null) {
+        domain.destroy();
+      }
     }
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -194,7 +196,9 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
             Paths.get(template + ".org"), Paths.get(template), StandardCopyOption.REPLACE_EXISTING);
         Files.delete(Paths.get(template + ".org"));
       }
-      domain.shutdownUsingServerStartPolicy();
+      if (domain != null) {
+        domain.destroy();
+      }
     }
     logger.info("SUCCESS - " + testMethodName);
   }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {`
`128`	`128`	`Paths.get(template + ".org"), Paths.get(template), StandardCopyOption.REPLACE_EXISTING);`
`129`	`129`	`Files.delete(Paths.get(template + ".org"));`
`130`	`130`	`}`
`131`		`- domain.shutdownUsingServerStartPolicy();`
	`131`	`+ if (domain != null) {`
	`132`	`+ domain.destroy();`
	`133`	`+ }`
`132`	`134`	`}`
`133`	`135`	`logger.info("SUCCESS - " + testMethodName);`
`134`	`136`	`}`
`@@ -194,7 +196,9 @@ public void testCreateDomainTwoMixedCluster() throws Exception {`
`194`	`196`	`Paths.get(template + ".org"), Paths.get(template), StandardCopyOption.REPLACE_EXISTING);`
`195`	`197`	`Files.delete(Paths.get(template + ".org"));`
`196`	`198`	`}`
`197`		`- domain.shutdownUsingServerStartPolicy();`
	`199`	`+ if (domain != null) {`
	`200`	`+ domain.destroy();`
	`201`	`+ }`
`198`	`202`	`}`
`199`	`203`	`logger.info("SUCCESS - " + testMethodName);`
`200`	`204`	`}`