Skip to content

Refactor to single log output to make test less flaky #1353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lydiaralphgov wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Refactor to single log output to make test less flaky #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/uk/gov/hmcts/reform/preapi/tasks/migration/BatchImportMissingMkAssets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import java.util.UUID;
import java.util.stream.Collectors;

import static java.lang.String.format;

@Slf4j
@Component
public class BatchImportMissingMkAssets extends RobotUserTask {
Expand Down Expand Up @@ -185,7 +187,7 @@ private boolean copyBlobBetweenContainers(RecordingDTO recording) {
);
return true;
} catch (Exception e) {
String message = String.format(
String message = format(
"Failed to copy blob '%s' between containers: %s -> %s",
blobName,
azureVodafoneStorageService.getStorageAccountName() + "/" + vfSourceContainer,
Expand Down Expand Up @@ -222,10 +224,9 @@ private List<String> awaitBatchComplete(List<String> jobNames, IMediaService med
} while (!jobs.isEmpty() && sleptFor < maxSleepTime);
if (!jobs.isEmpty()) {
log.error(
"Timeout waiting for transform jobs to complete for batch, {} job(s) still processing", jobs.size());
jobs.forEach(job -> {
log.error("Unknown job processing state: {}", job);
});
format("Timeout waiting for transform jobs to complete for batch, %d job(s) still processing. "
+ "Job names: %s",
jobs.size(), String.join(", ", jobs)));
var unknownJobs = jobs;
return jobNames.stream().filter(name -> !unknownJobs.contains(name)).toList();
} else {
Expand Down Expand Up @@ -330,7 +331,7 @@ protected void writeCsvReport() {
writer.println("RecordingId,CaseReference,Filename,Duration,MigrationStatus,ErrorMessage");

for (ReportItem item : reportItems) {
String line = String.format(
String line = format(
"%s,%s,%s,%d,%s,%s",
item.recordingId,
item.caseReference,
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/uk/gov/hmcts/reform/preapi/tasks/migration/BatchImportMissingMkAssetsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ void runFailureBatchTimeout(CapturedOutput output) throws IOException {
assertThat(output.getOut())
.contains("Timeout waiting for transform jobs to complete for batch, 1 job(s) still processing");
assertThat(output.getOut()).contains("Waiting for 1/1 transform jobs to complete for batch");
assertThat(output.getOut()).contains("Unknown job processing state: " + jobName);
assertThat(output.getOut()).contains("Job names: " + jobName);
}

@Test
Expand All @@ -474,25 +474,25 @@ void findAllVodafoneRecordings_ShouldReturnVodafoneRecordingsWithNullDuration()
recording1.setId(UUID.randomUUID());
recording1.setDuration(null);
recording1.setDeletedAt(null);

CaptureSessionDTO captureSession1 = new CaptureSessionDTO();
captureSession1.setOrigin(RecordingOrigin.VODAFONE);
recording1.setCaptureSession(captureSession1);

RecordingDTO recording2 = new RecordingDTO();
recording2.setId(UUID.randomUUID());
recording2.setDuration(Duration.ofMinutes(5));
recording2.setDuration(Duration.ofMinutes(5));
recording2.setDeletedAt(null);

CaptureSessionDTO captureSession2 = new CaptureSessionDTO();
captureSession2.setOrigin(RecordingOrigin.VODAFONE);
recording2.setCaptureSession(captureSession2);

when(recordingService.findAllVodafoneRecordings())
.thenReturn(List.of(recording1));

List<RecordingDTO> result = recordingService.findAllVodafoneRecordings();

assertThat(result).hasSize(1);
assertThat(result.get(0).getId()).isEqualTo(recording1.getId());
verify(recordingService, times(1)).findAllVodafoneRecordings();
Expand Down
Loading