From 4c649b7280a7b794f2189e380b4e76e285df3565 Mon Sep 17 00:00:00 2001 From: Kiran Prakash Date: Mon, 15 Jul 2024 09:55:25 -0700 Subject: [PATCH] resolve flakiness Signed-off-by: Kiran Prakash --- .../DefaultTaskCancellationTests.java | 18 +++++++++--------- ...tRunningTaskFirstStrategyStrategyTests.java | 2 +- .../TaskSelectionStrategyTests.java | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/src/test/java/org/opensearch/search/sandboxing/cancellation/DefaultTaskCancellationTests.java b/server/src/test/java/org/opensearch/search/sandboxing/cancellation/DefaultTaskCancellationTests.java index 2d1233eb83286..d836089b74119 100644 --- a/server/src/test/java/org/opensearch/search/sandboxing/cancellation/DefaultTaskCancellationTests.java +++ b/server/src/test/java/org/opensearch/search/sandboxing/cancellation/DefaultTaskCancellationTests.java @@ -29,7 +29,7 @@ public class DefaultTaskCancellationTests extends OpenSearchTestCase { - private class TestTaskCancellationImpl extends DefaultTaskCancellation { + private static class TestTaskCancellationImpl extends DefaultTaskCancellation { public TestTaskCancellationImpl( TaskSelectionStrategy taskSelectionStrategy, @@ -75,8 +75,8 @@ public void testGetCancellableTasksFrom_returnsTasksWhenBreachingThreshold() { List cancellableTasksFrom = taskCancellation.getCancellableTasksFrom(sandbox1); assertEquals(2, cancellableTasksFrom.size()); - assertEquals(4321, cancellableTasksFrom.get(0).getTask().getId()); - assertEquals(1234, cancellableTasksFrom.get(1).getTask().getId()); + assertEquals(1234, cancellableTasksFrom.get(0).getTask().getId()); + assertEquals(4321, cancellableTasksFrom.get(1).getTask().getId()); } public void testGetCancellableTasksFrom_returnsNoTasksWhenBreachingThreshold() { @@ -115,8 +115,8 @@ public void testCancelTasks_cancelsGivenTasks() { List cancellableTasksFrom = taskCancellation.getAllCancellableTasks(); assertEquals(2, cancellableTasksFrom.size()); - assertEquals(4321, cancellableTasksFrom.get(0).getTask().getId()); - assertEquals(1234, cancellableTasksFrom.get(1).getTask().getId()); + assertEquals(1234, cancellableTasksFrom.get(0).getTask().getId()); + assertEquals(4321, cancellableTasksFrom.get(1).getTask().getId()); taskCancellation.cancelTasks(); assertTrue(cancellableTasksFrom.get(0).getTask().isCancelled()); @@ -153,8 +153,8 @@ public void testGetAllCancellableTasks_ReturnsTasksWhenBreachingThresholds() { List allCancellableTasks = taskCancellation.getAllCancellableTasks(); assertEquals(2, allCancellableTasks.size()); - assertEquals(4321, allCancellableTasks.get(0).getTask().getId()); - assertEquals(1234, allCancellableTasks.get(1).getTask().getId()); + assertEquals(1234, allCancellableTasks.get(0).getTask().getId()); + assertEquals(4321, allCancellableTasks.get(1).getTask().getId()); } public void testGetCancellableTasksFrom_returnsTasksEvenWhenSandboxIdNotFound() { @@ -174,7 +174,7 @@ public void testGetCancellableTasksFrom_returnsTasksEvenWhenSandboxIdNotFound() List cancellableTasksFrom = taskCancellation.getCancellableTasksFrom(sandbox1); assertEquals(2, cancellableTasksFrom.size()); - assertEquals(4321, cancellableTasksFrom.get(0).getTask().getId()); - assertEquals(1234, cancellableTasksFrom.get(1).getTask().getId()); + assertEquals(1234, cancellableTasksFrom.get(0).getTask().getId()); + assertEquals(4321, cancellableTasksFrom.get(1).getTask().getId()); } } diff --git a/server/src/test/java/org/opensearch/search/sandboxing/cancellation/ShortestRunningTaskFirstStrategyStrategyTests.java b/server/src/test/java/org/opensearch/search/sandboxing/cancellation/ShortestRunningTaskFirstStrategyStrategyTests.java index cdd3053e58373..c88cb37781a10 100644 --- a/server/src/test/java/org/opensearch/search/sandboxing/cancellation/ShortestRunningTaskFirstStrategyStrategyTests.java +++ b/server/src/test/java/org/opensearch/search/sandboxing/cancellation/ShortestRunningTaskFirstStrategyStrategyTests.java @@ -29,6 +29,6 @@ public void testSortingCondition() { List tasks = Arrays.asList(task1, task3, task2); tasks.sort(new ShortestRunningTaskFirstStrategy().sortingCondition()); - assertEquals(Arrays.asList(task1, task2, task3), tasks); + assertEquals(Arrays.asList(task3, task2, task1), tasks); } } diff --git a/server/src/test/java/org/opensearch/search/sandboxing/cancellation/TaskSelectionStrategyTests.java b/server/src/test/java/org/opensearch/search/sandboxing/cancellation/TaskSelectionStrategyTests.java index fe89263a09c3c..6fdae3a6fece9 100644 --- a/server/src/test/java/org/opensearch/search/sandboxing/cancellation/TaskSelectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/search/sandboxing/cancellation/TaskSelectionStrategyTests.java @@ -22,7 +22,7 @@ public class TaskSelectionStrategyTests extends OpenSearchTestCase { public static class TestTaskSelectionStrategy extends AbstractTaskSelectionStrategy { @Override public Comparator sortingCondition() { - return Comparator.comparingLong(Task::getStartTime).reversed(); + return Comparator.comparingLong(Task::getId); } }