From 35c9ce120f9e18dde36a9141de9695365389cadd Mon Sep 17 00:00:00 2001 From: Jackie Han Date: Fri, 22 Dec 2023 12:32:02 -0800 Subject: [PATCH] add more timeout Signed-off-by: Jackie Han --- .../FlowFrameworkRestTestCase.java | 2 +- .../rest/FlowFrameworkRestApiIT.java | 21 ++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java index f20f47e33..15ffb65e1 100644 --- a/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java +++ b/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java @@ -394,7 +394,7 @@ protected Response deprovisionWorkflow(String workflowId) throws Exception { protected Response deleteWorkflow(String workflowId) throws Exception { return TestHelpers.makeRequest( client(), - "POST", + "DELETE", String.format(Locale.ROOT, "%s/%s", WORKFLOW_URI, workflowId), ImmutableMap.of(), "", diff --git a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java index e4e827569..6999d2779 100644 --- a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java @@ -24,9 +24,12 @@ import org.opensearch.flowframework.model.WorkflowState; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import static org.opensearch.flowframework.common.CommonValue.CREDENTIAL_FIELD; import static org.opensearch.flowframework.common.CommonValue.PROVISION_WORKFLOW; @@ -196,14 +199,26 @@ public void testCreateAndProvisionAgentFrameworkWorkflow() throws Exception { // Assert based on the agent-framework template List resourcesCreated = searchHitWorkflowState.resourcesCreated(); + Set expectedStepNames = new HashSet<>(); + expectedStepNames.add("root_agent"); + expectedStepNames.add("sub_agent"); + expectedStepNames.add("openAI_connector"); + expectedStepNames.add("gpt-3.5-model"); + expectedStepNames.add("deployed-gpt-3.5-model"); + Set stepNames = resourcesCreated.stream().map(ResourceCreated::workflowStepId).collect(Collectors.toSet()); + assertEquals(5, resourcesCreated.size()); - assertEquals("register_agent", resourcesCreated.get(0).workflowStepName()); + assertEquals(stepNames, expectedStepNames); assertNotNull(resourcesCreated.get(0).resourceId()); // Hit Deprovision API Response deprovisionResponse = deprovisionWorkflow(workflowId); assertEquals(RestStatus.OK, TestHelpers.restStatus(deprovisionResponse)); - getAndAssertWorkflowStatus(workflowId, State.NOT_STARTED, ProvisioningProgress.NOT_STARTED); + assertBusy( + () -> { getAndAssertWorkflowStatus(workflowId, State.NOT_STARTED, ProvisioningProgress.NOT_STARTED); }, + 30, + TimeUnit.SECONDS + ); // Hit Delete API Response deleteResponse = deleteWorkflow(workflowId); @@ -211,7 +226,7 @@ public void testCreateAndProvisionAgentFrameworkWorkflow() throws Exception { // Search this workflow id in global_context index to make sure it's deleted SearchResponse searchResponseAfterDeletion = searchWorkflows(query); - assertEquals(0, searchResponse.getHits().getTotalHits().value); + assertBusy(() -> assertEquals(0, searchResponseAfterDeletion.getHits().getTotalHits().value), 30, TimeUnit.SECONDS); } }