Merge remote-tracking branch 'origin/develop' into watch-fix-old

Author: rjeberhard

operator/pom.xml

@@ -338,7 +338,11 @@
             <artifactId>simplestub</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+          <groupId>com.google.code.tempus-fugit</groupId>
+          <artifactId>tempus-fugit</artifactId>
+          <version>1.1</version>
+        </dependency>
     </dependencies>
 
 </project>

operator/src/test/java/oracle/kubernetes/operator/helpers/ServerKubernetesObjectsLookupTest.java

@@ -11,6 +11,8 @@
 import static org.hamcrest.Matchers.sameInstance;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
+import com.google.code.tempusfugit.concurrency.IntermittentTestRunner;
+import com.google.code.tempusfugit.concurrency.annotations.Intermittent;
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
 import io.kubernetes.client.models.V1ObjectMeta;
@@ -23,32 +25,35 @@
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
+import org.junit.runner.RunWith;
 
+@RunWith(IntermittentTestRunner.class)
 public class ServerKubernetesObjectsLookupTest {
 
   private List<Memento> mementos = new ArrayList<>();
 
+  private String retryLegalName;
+  private ServerKubernetesObjects retryInstance;
+
   @Rule
   public TestWatcher watcher =
       new TestWatcher() {
         @Override
         protected void failed(Throwable e, Description description) {
           super.failed(e, description);
           System.out.println("Tell Russell\n" + DomainPresenceMonitor.getExplanation());
-          try {
-            Memento serverMap =
-                StaticStubSupport.preserve(ServerKubernetesObjectsManager.class, "serverMap");
-            Map<String, ServerKubernetesObjects> map = serverMap.getOriginalValue();
-            System.out.println("   internal: " + map);
-            System.out.println(
-                "   returned: " + ServerKubernetesObjectsManager.getServerKubernetesObjects());
-          } catch (NoSuchFieldException ignored) {
-          }
+          Map<String, ServerKubernetesObjects> returnedMap =
+              ServerKubernetesObjectsManager.getServerKubernetesObjects();
+
+          System.out.printf(
+              "\nObject in map with key %s is %s, which compares %b",
+              retryLegalName,
+              returnedMap.get(retryLegalName),
+              retryInstance == returnedMap.get(retryLegalName));
         }
       };
 
@@ -82,7 +87,7 @@ public void whenNoPreexistingDomains_createEmptyServerKubernetesObjectsMap() {
   }
 
   @Test
-  @Ignore
+  @Intermittent(repetition = 10)
   public void whenK8sHasDomainWithOneServer_canLookupFromServerKubernetesObjectsFactory() {
     Domain domain = createDomain("UID1", "ns1");
     DomainPresenceInfo info = DomainPresenceInfoManager.getOrCreate(domain);
@@ -91,6 +96,8 @@ public void whenK8sHasDomainWithOneServer_canLookupFromServerKubernetesObjectsFa
 
     assertThat(info.getServers(), hasEntry(equalTo("admin"), sameInstance(sko)));
 
+    retryLegalName = LegalNames.toServerName("UID1", "admin");
+    retryInstance = sko;
     assertThat(
         ServerKubernetesObjectsManager.getServerKubernetesObjects(),
         hasEntry(equalTo(LegalNames.toServerName("UID1", "admin")), sameInstance(sko)));