From 31eb8c1015cfa209d678438d324780a70e41c51b Mon Sep 17 00:00:00 2001 From: Snow Pettersen Date: Sun, 8 Dec 2024 09:44:20 -0800 Subject: [PATCH] fix integration test flake (#145) --- .../kotlin/io/bitdrift/capture/CaptureLoggerTest.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/CaptureLoggerTest.kt b/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/CaptureLoggerTest.kt index 17d5db1c..4d3309cc 100644 --- a/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/CaptureLoggerTest.kt +++ b/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/CaptureLoggerTest.kt @@ -314,10 +314,16 @@ class CaptureLoggerTest { val sdkConfigured = CaptureTestJniLibrary.nextUploadedLog() assertThat(sdkConfigured.message).isEqualTo("SDKConfigured") - val log = CaptureTestJniLibrary.nextUploadedLog() + var log = CaptureTestJniLibrary.nextUploadedLog() + + // Sometimes a resource log is sent before the actual log, so skip it to make the tests more + // stable. + if (log.fields.containsKey("_battery_val")) { + log = CaptureTestJniLibrary.nextUploadedLog() + } assertThat(log.level).isEqualTo(LogLevel.DEBUG.value) - assertThat(log.message).isEqualTo("test log") assertThat(log.fields).isEqualTo(expectedFields) + assertThat(log.message).isEqualTo("test log") assertThat(log.sessionId).isEqualTo("SESSION_ID") assertThat(log.rfc3339Timestamp).isEqualTo("2022-07-05T18:55:58.123Z") }