Merge pull request #136 from ooni/fix-test-stop-result

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

Author: sdsantos

composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt

@@ -253,9 +253,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 {
@@ -337,7 +338,7 @@ class Dependencies(
         goToReviewDescriptorUpdates = goToReviewDescriptorUpdates,
         getTestDescriptors = getTestDescriptors::invoke,
         observeTestRunState = testStateManager.observeState(),
-        observeTestRunErrors = testStateManager.observeError(),
+        observeTestRunErrors = testStateManager.observeErrors(),
         shouldShowVpnWarning = shouldShowVpnWarning::invoke,
         fetchDescriptorUpdate = fetchDescriptorUpdate,
         observeAvailableUpdatesState = getDescriptorUpdate::observeAvailableUpdatesState,
@@ -402,7 +403,7 @@ class Dependencies(
         onBack = onBack,
         goToResults = goToResults,
         observeTestRunState = testStateManager.observeState(),
-        observeTestRunErrors = testStateManager.observeError(),
+        observeTestRunErrors = testStateManager.observeErrors(),
         cancelTestRun = testStateManager::cancelTestRun,
     )
 

composeApp/src/commonMain/kotlin/org/ooni/probe/domain/RunDescriptors.kt

@@ -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)
@@ -53,6 +54,7 @@ class RunDescriptors(
             // Exceptions were logged in the Engine
         } finally {
             setCurrentTestState { TestRunState.Idle(LocalDateTime.now(), true) }
+            finishInProgressData()
         }
     }
 

composeApp/src/commonMain/kotlin/org/ooni/probe/domain/TestRunStateManager.kt

@@ -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)