Merge pull request #1207 from oracle/shutdownfix

rjeberhard · web-flow · commit 3c706940ab86 · 2019-08-22T14:03:56.000-04:00
OWLS-76416, fixed intermittent failure
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItPodsShutdown.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItPodsShutdown.java
@@ -470,7 +470,7 @@ public void testAddShutdownOptionsToMsForced() throws Exception {
       updateCrdYamlVerifyShutdown(crd, delayTime);
 
       Assert.assertTrue(checkShutdownUpdatedProp(domainUid + "-managed-server1", "Forced"));
-      if ((1.5 * terminationDefaultOptionsTime < terminationTime)) {
+      if ((2 * terminationDefaultOptionsTime < terminationTime)) {
         logger.info("\"FAILURE: ignored timeout Forced value during shutdown");
         throw new Exception("FAILURE: ignored timeout Forced during shutdown");
       }

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ public void testAddShutdownOptionsToMsForced() throws Exception {`
`470`	`470`	`updateCrdYamlVerifyShutdown(crd, delayTime);`
`471`	`471`
`472`	`472`	`Assert.assertTrue(checkShutdownUpdatedProp(domainUid + "-managed-server1", "Forced"));`
`473`		`- if ((1.5 * terminationDefaultOptionsTime < terminationTime)) {`
	`473`	`+ if ((2 * terminationDefaultOptionsTime < terminationTime)) {`
`474`	`474`	`logger.info("\"FAILURE: ignored timeout Forced value during shutdown");`
`475`	`475`	`throw new Exception("FAILURE: ignored timeout Forced during shutdown");`
`476`	`476`	`}`