Skip to content

fix: Result not marked as done when test is manually stopped #136

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
merged 2 commits into from
Oct 3, 2024
Merged

fix: Result not marked as done when test is manually stopped #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f643f19
fix: Result not marked as done when test is manually stopped
sdsantos Oct 2, 2024
9a5bac0
Fix kotlin lint
sdsantos Oct 2, 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
7 changes: 4 additions & 3 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,10 @@ class Dependencies(
getCurrentTestRunState = testStateManager.observeState(),
setCurrentTestState = testStateManager::updateState,
runNetTest = { runNetTest(it)() },
observeCancelTestRun = testStateManager.observeTestRunCancels(),
observeCancelTestRun = testStateManager.observeCancels(),
reportTestRunError = testStateManager::reportError,
getEnginePreferences = getEnginePreferences::invoke,
finishInProgressData = finishInProgressData::invoke,
)
}
private val saveTestDescriptors by lazy {
Expand Down Expand Up @@ -302,7 +303,7 @@ class Dependencies(
getFirstRun = getFirstRun::invoke,
getTestDescriptors = getTestDescriptors::invoke,
observeTestRunState = testStateManager.observeState(),
observeTestRunErrors = testStateManager.observeError(),
observeTestRunErrors = testStateManager.observeErrors(),
shouldShowVpnWarning = shouldShowVpnWarning::invoke,
)

Expand Down Expand Up @@ -350,7 +351,7 @@ class Dependencies(
onBack = onBack,
goToResults = goToResults,
observeTestRunState = testStateManager.observeState(),
observeTestRunErrors = testStateManager.observeError(),
observeTestRunErrors = testStateManager.observeErrors(),
cancelTestRun = testStateManager::cancelTestRun,
)

Expand Down
2 changes: 2 additions & 0 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/domain/RunDescriptors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class RunDescriptors(
private val observeCancelTestRun: Flow<Unit>,
private val reportTestRunError: (TestRunError) -> Unit,
private val getEnginePreferences: suspend () -> EnginePreferences,
private val finishInProgressData: suspend () -> Unit,
) {
suspend operator fun invoke(spec: RunSpecification) {
val descriptors = getTestDescriptorsBySpec(spec)
Expand All @@ -53,6 +54,7 @@ class RunDescriptors(
// Exceptions were logged in the Engine
} finally {
setCurrentTestState { TestRunState.Idle(LocalDateTime.now(), true) }
finishInProgressData()
}
}

Expand Down
4 changes: 2 additions & 2 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/domain/TestRunStateManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class TestRunStateManager(
}
}

fun observeTestRunCancels() = cancels.asSharedFlow()
fun observeCancels() = cancels.asSharedFlow()

fun observeError() = errors.asSharedFlow()
fun observeErrors() = errors.asSharedFlow()

fun updateState(update: (TestRunState) -> TestRunState) = state.update(update)

Expand Down