Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky SqlStatementResourceTest. (#14498) 

Mocks generally have state and should not be static. In particular, the
"Yielder" included in one of the mocks can only be iterated once, which
made the test suite order-dependent.
This commit is contained in:
Gian Merlino 2023-06-28 17:12:44 -07:00 committed by GitHub
parent fd1a88a6b3
commit c798d3fb2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/SqlStatementResourceTest.java
View File

@ -222,7 +222,7 @@ public class SqlStatementResourceTest extends MSQTestBase
new Object[]{234, "foo1", "bar1"}
);
private static final MSQTaskReport MSQ_SELECT_TASK_REPORT = new MSQTaskReport(
private final MSQTaskReport selectTaskReport = new MSQTaskReport(
FINISHED_SELECT_MSQ_QUERY,
new MSQTaskReportPayload(
new MSQStatusReport(
@ -315,10 +315,11 @@ public class SqlStatementResourceTest extends MSQTestBase
);
private static final String FAILURE_MSG = "failure msg";
private static SqlStatementResource resource;
@Mock
private static OverlordClient overlordClient;
private static void setupMocks(OverlordClient indexingServiceClient) throws JsonProcessingException
@Mock
private OverlordClient overlordClient;
private void setupMocks(OverlordClient indexingServiceClient) throws JsonProcessingException
{
Mockito.when(indexingServiceClient.taskStatus(ArgumentMatchers.eq(ACCEPTED_SELECT_MSQ_QUERY)))
@ -392,8 +393,7 @@ public class SqlStatementResourceTest extends MSQTestBase
Mockito.when(indexingServiceClient.taskReportAsMap(FINISHED_SELECT_MSQ_QUERY))
.thenReturn(Futures.immediateFuture(mapper.readValue(
mapper.writeValueAsString(TaskReport.buildTaskReports(
MSQ_SELECT_TASK_REPORT)),
mapper.writeValueAsString(TaskReport.buildTaskReports(selectTaskReport)),
new TypeReference<Map<String, Object>>()
{
}