diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-11-14 09:44:30 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-11-18 11:47:05 +0100 |
| commit | b14b0bf4dead7538af5f04409318e282ed06e1af (patch) | |
| tree | 73cb9eab1305d8d0a8cd06a492e6f070e53e0f59 /android | |
| parent | b8dd33ba5a3c270f4b0b75ff5f2f6c28216981d2 (diff) | |
| download | mullvadvpn-b14b0bf4dead7538af5f04409318e282ed06e1af.tar.xz mullvadvpn-b14b0bf4dead7538af5f04409318e282ed06e1af.zip | |
Fix flaky removal of VPN profiles
Diffstat (limited to 'android')
| -rw-r--r-- | android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt index c0acddc3da..c96718da61 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt @@ -6,7 +6,9 @@ import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiObject2 +import androidx.test.uiautomator.Until import java.util.regex.Pattern +import net.mullvad.mullvadvpn.test.common.constant.DEFAULT_TIMEOUT import net.mullvad.mullvadvpn.test.common.extension.findObjectByCaseInsensitiveText import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout import net.mullvad.mullvadvpn.test.common.extension.hasObjectWithTimeout @@ -23,8 +25,11 @@ class ForgetAllVpnAppsInSettingsTestRule : BeforeTestExecutionCallback { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK } ) - val vpnSettingsButtons = - device.findObjects(By.res(SETTINGS_PACKAGE, VPN_SETTINGS_BUTTON_ID)) + + val vpnSettingsSelector = By.res(SETTINGS_PACKAGE, VPN_SETTINGS_BUTTON_ID) + device.wait(Until.hasObject(vpnSettingsSelector), DEFAULT_TIMEOUT) + val vpnSettingsButtons = device.findObjects(vpnSettingsSelector) + vpnSettingsButtons .filter { !it.isHardcodedVpn() } .forEach { button -> |