Skip to content
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

fix(core): propagate meta properties into final TestResult #875

Merged
merged 10 commits into from
Jan 22, 2024
Merged

fix(core): propagate meta properties into final TestResult #875

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cad1958
fix(core): meta properties are in final TestResult
matzuk Dec 8, 2023
36a5b8a
fix(core): pr fixes
matzuk Dec 12, 2023
f4bc58c
fix(android_parsing): remote parse without overridden testrun listene…
matzuk Dec 11, 2023
0c65cbe
fix(android_parsing): change overrides only when test run fails
matzuk Dec 12, 2023
5ea2261
fix(android_parsing): check overrides value too (annotation producer)
matzuk Dec 12, 2023
a4508ae
Revert "fix(android_parsing): check overrides value too (annotation p…
matzuk Dec 22, 2023
ae9f1c2
Revert "fix(android_parsing): change overrides only when test run fails"
matzuk Dec 22, 2023
57589ca
Revert "fix(android_parsing): remote parse without overridden testrun…
matzuk Dec 22, 2023
c1dd57f
Merge remote-tracking branch 'origin/develop' into feature/raw_json_m…
matzuk Dec 22, 2023
15e6739
Merge branch 'develop' into feature/raw_json_meta_2
Malinskiy Jan 22, 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
24 changes: 17 additions & 7 deletions core/src/main/kotlin/com/malinskiy/marathon/execution/progress/PoolProgressAccumulator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import kotlin.math.roundToInt
class PoolProgressAccumulator(
private val poolId: DevicePoolId,
shard: TestShard,
private val configuration: Configuration,
configuration: Configuration,
private val track: Track
) {
private val tests: HashMap<String, StateMachine<TestState, TestEvent, TestAction>> = HashMap()
private val tests: HashMap<String, TestExecutionData> = HashMap()
private val logger = MarathonLogging.logger {}
private val executionStrategy = configuration.executionStrategy

Expand Down Expand Up @@ -257,7 +257,7 @@ class PoolProgressAccumulator(
val allTests = shard.tests + shard.flakyTests
allTests.groupBy { it }.map {
val count = it.value.size
it.key.toTestName() to createState(count)
it.key.toTestName() to TestExecutionData(it.key, createState(count))
}.also {
tests.putAll(it)
}
Expand Down Expand Up @@ -319,7 +319,12 @@ class PoolProgressAccumulator(
val (testResult: TestResult?, device: DeviceInfo?) = extractEventAndDevice(transition)
if (testResult == null || device == null) return

track.test(poolId, device, testResult, final)
val testNameFromTestResult = testResult.test.toTestName()
val originalTest = tests[testNameFromTestResult]?.originalTest
val updatedTestResult = if (originalTest == null) testResult
else testResult.copy(test = originalTest)

track.test(poolId, device, updatedTestResult, final)
}

private fun extractEventAndDevice(transition: StateMachine.Transition<TestState, TestEvent, TestAction>): Pair<TestResult?, DeviceInfo?> {
Expand Down Expand Up @@ -348,7 +353,7 @@ class PoolProgressAccumulator(
fun aggregateResult(): Boolean {
synchronized(tests) {
return tests.map {
when (it.value.state) {
when (it.value.state.state) {
is TestState.Added -> {
logger.error { "Expected to run ${it.key} but no events received" }
false
Expand Down Expand Up @@ -377,7 +382,7 @@ class PoolProgressAccumulator(
var total = 0

tests.values.forEach {
val state = it.state
val state = it.state.state
when (state) {
is TestState.Added -> {
total += state.total
Expand Down Expand Up @@ -408,7 +413,7 @@ class PoolProgressAccumulator(
}

private fun transition(test: Test, transition: TestEvent): StateMachine.Transition<TestState, TestEvent, TestAction>? {
val testActionTransition = tests[test.toTestName()]?.transition(transition)
val testActionTransition = tests[test.toTestName()]?.state?.transition(transition)
if (testActionTransition == null) {
logger.warn { "No FSM registered for test ${test.toTestName()}" }
}
Expand All @@ -433,3 +438,8 @@ private fun <STATE : Any, EVENT : Any, SIDE_EFFECT : Any> StateMachine.Transitio
null -> null
}
}

private data class TestExecutionData(
val originalTest: Test,
val state: StateMachine<TestState, TestEvent, TestAction>
)