Merge pull request #16668 from jvanhill/rtc282932-2

Fix #2 for test failure in RTC 282932. Unconditionally reset the serv…
OpenLiberty · Apr 20, 2021 · 94e5f16 · 94e5f16
2 parents 452f6c5 + 11ec0ac
commit 94e5f16
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/....security.spnego.fat.common/fat/src/com/ibm/ws/security/spnego/fat/config/CommonTest.java b/....security.spnego.fat.common/fat/src/com/ibm/ws/security/spnego/fat/config/CommonTest.java
@@ -313,14 +313,15 @@ public static void commonSetUp(String testServerName, String serverXml, List<Str
             Log.info(c, thisMethod, "Using initial config: " + config);
         }
 
+        if (getKdcHelper() == null) {
+            setKdcHelper(getKdcHelper(getMyServer()));
+        } else {
+            createKrbConf(getKdcHelper().server);
+        }
+
         if (createSpnAndKeytab) {
             try {
                 Log.info(c, thisMethod, "Creating SPN and keytab");
-                if (getKdcHelper() == null) {
-                    setKdcHelper(getKdcHelper(getMyServer()));
-                } else {
-                    createKrbConf(getKdcHelper().server);
-                }
                 getKdcHelper().createSpnAndKeytab(spnRealm, useCanonicalHostName, SPNEGOConstants.DEFAULT_CMD_ARGS);
             } catch (Exception e) {
                 Log.info(c, thisMethod, "Got unexpected exception; no tests will be run: " + CommonTest.maskHostnameAndPassword(e.getMessage()));