summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2025-03-03 15:08:54 +0100
committerAlbin <albin@mullvad.net>2025-03-03 15:08:54 +0100
commit8ceda7aeb54ed058543e1a665d24cd5c928a872e (patch)
tree712a1c2fc74b267d8a8d56bf8a9118cd3292c32e /android
parentb3048369604e26f753f00618bf7c00b736fa1c2c (diff)
parent624f90322d294e0ff2331b37ad813aa45a86c624 (diff)
downloadmullvadvpn-8ceda7aeb54ed058543e1a665d24cd5c928a872e.tar.xz
mullvadvpn-8ceda7aeb54ed058543e1a665d24cd5c928a872e.zip
Merge branch 'wait-until-idle-in-device-list-test-to-avoid-flakiness-droid-1848'
Diffstat (limited to 'android')
-rw-r--r--android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt3
1 files changed, 3 insertions, 0 deletions
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
index 19674815c1..54af6057aa 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
@@ -52,6 +52,9 @@ class TooManyDevicesMockApiTest : MockApiTest() {
device.findObjectWithTimeout(By.text("Continue with login").hasParent(By.enabled((false))))
// Act
+ // Wait until the application is idle to avoid skipping input events that are filtered out
+ // depending on lifecycle state (dropUnlessResumed).
+ device.waitForIdle()
app.attemptToRemoveDevice()
// Assert that a device was removed