- debug quota test failures

Axway-API-Management-Plus · Dec 4, 2023 · 0f1635a · 0f1635a
1 parent f7101c0
commit 0f1635a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java b/modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java
@@ -119,6 +119,8 @@ public synchronized void deleteInstance() {
             }
             instance.apiManagerVersion = null;
             instance = null;
+            usingOrgAdmin = false;
+            hasAdminAccount = false;
             APIMHttpClient.deleteInstances();
         }
     }

diff --git a/modules/apis/src/test/java/com/axway/apim/test/ImportTestAction.java b/modules/apis/src/test/java/com/axway/apim/test/ImportTestAction.java
@@ -50,7 +50,6 @@ public void doExecute(TestContext context) {
         String configFile = replaceDynamicContentInFile(origConfigFile, context, createTempFilename(origConfigFile));
         LOG.info("Using Replaced Swagger-File: " + apiDefinition);
         LOG.info("Using Replaced configFile-File: " + configFile);
-        LOG.info("API-Manager import is using user: '" + context.replaceDynamicContentInString("${oadminUsername1}") + "'");
         int expectedReturnCode = 0;
         try {
             expectedReturnCode = Integer.parseInt(context.getVariable("expectedReturnCode"));
@@ -135,10 +134,14 @@ public void doExecute(TestContext context) {
             args.add("-h");
             args.add(context.replaceDynamicContentInString("${apiManagerHost}"));
             args.add("-u");
-            if (useApiAdmin)
+            if (useApiAdmin) {
+                LOG.info("API-Manager import is using user: '" + context.replaceDynamicContentInString("${apiManagerUser}") + "'");
                 args.add(context.replaceDynamicContentInString("${apiManagerUser}"));
-            else
+            }
+            else {
+                LOG.info("API-Manager import is using user: '" + context.replaceDynamicContentInString("${oadminUsername1}") + "'");
                 args.add(context.replaceDynamicContentInString("${oadminUsername1}"));
+            }
             args.add("-p");
             if (useApiAdmin)
                 args.add(context.replaceDynamicContentInString("${apiManagerPass}"));