Skip to content

[Tests] Fix flaky tests 2024/05/09 #2083

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

Merged
jkasten2 merged 3 commits into from
May 10, 2024
Merged

[Tests] Fix flaky tests 2024/05/09 #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
346b4ce
wait for operation repo to start completely
jkasten2 May 9, 2024
685e471
flaky test due to not waiting for OperationRepo
jkasten2 May 9, 2024
939a164
fix flaky Retry-After test
jkasten2 May 10, 2024
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
2 changes: 1 addition & 1 deletion ...ignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class HttpClientTests : FunSpec({

mocks.factory.mockResponse = mockSuccessfulResponse
val response2 =
withTimeoutOrNull(999) {
withTimeoutOrNull(975) {
Comment thread
jinliu9508 marked this conversation as resolved.
mocks.httpClient.post("URL", JSONObject())
}

Expand Down
2 changes: 2 additions & 0 deletions ...onesignal/core/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,8 @@ class OperationRepoTests : FunSpec({
// When
mocks.operationRepo.addOperationLoadedListener(spyListener)
mocks.operationRepo.start()
// enqueueAndWait used to know we are fully loaded.
mocks.operationRepo.enqueueAndWait(mockOperation())

// Then
mocks.operationRepo.hasSubscribers shouldBe true
Expand Down
20 changes: 15 additions & 5 deletions ...e/src/test/java/com/onesignal/user/internal/migrations/RecoverFromDroppedLoginBugTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.onesignal.user.internal.migrations

import com.onesignal.common.threading.Waiter
import com.onesignal.core.internal.config.ConfigModelStore
import com.onesignal.core.internal.operations.IOperationRepoLoadedListener
import com.onesignal.core.internal.operations.impl.OperationModelStore
import com.onesignal.core.internal.operations.impl.OperationRepo
import com.onesignal.core.internal.time.impl.Time
Expand Down Expand Up @@ -31,16 +33,24 @@ class RecoverFromDroppedLoginBugTests : FunSpec({
)
every { mockOperationModelStore.loadOperations() } just runs
every { mockOperationModelStore.list() } returns listOf()

val recovery = RecoverFromDroppedLoginBug(operationRepo, MockHelper.identityModelStore(), mockConfigModelStore)
every { recovery.onOperationRepoLoaded() } just runs
val recovery = spyk(RecoverFromDroppedLoginBug(operationRepo, MockHelper.identityModelStore(), mockConfigModelStore))

// When
operationRepo.start()
recovery.start()
val waiter = Waiter()
operationRepo.addOperationLoadedListener(
object : IOperationRepoLoadedListener {
override fun onOperationRepoLoaded() {
waiter.wake()
}
},
)
operationRepo.start()
Comment thread
jinliu9508 marked this conversation as resolved.
// Waiting here ensures recovery.onOperationRepoLoaded() is called consistently
waiter.waitForWake()

// Then
verify {
verify(exactly = 1) {
operationRepo.subscribe(recovery)
recovery.onOperationRepoLoaded()
}
Expand Down