Re-enable FocusMeteringControlTest tests failing for MainDispatcherRule
The tests were flaky due to concurrent usage of Dispatchers.Main, most probably due to not all coroutine jobs being cleaned up properly while using MainDispatcherRule. The tests no longer uses multiple threads for launching coroutines and it does not use MainDispatcherRule anymore as well where the concurrent accessing was happening, ref: aosp/2384001
So the tests are no longer flaky and can be re-enabled now.
Bug: 266123157
Test: camera-pipe-integration / FocusMeteringControlTest
Change-Id: I119d80c898ce247b166aaaf9b5d2301dc801e8b1
diff --git a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/FocusMeteringControlTest.kt b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/FocusMeteringControlTest.kt
index 50c55ae..157d7a7 100644
--- a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/FocusMeteringControlTest.kt
+++ b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/adapter/FocusMeteringControlTest.kt
@@ -332,7 +332,6 @@
}
}
- @Ignore("b/266123157")
@Test
fun startFocusAndMetering_multiplePoints_3ARectsAreCorrect() = runBlocking {
// Camera 0 i.e. Max AF count = 3, Max AE count = 3, Max AWB count = 1
@@ -815,7 +814,6 @@
assertThat(focusMeteringControl.isFocusMeteringSupported(action)).isTrue()
}
- @Ignore("b/266123157")
@Test
fun isFocusMeteringSupported_noSupport3ARegion_shouldReturnFalse() {
val action = FocusMeteringAction.Builder(point1).build()
