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.

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

Re-enable and fix testConnectAndVerifyWithConnectionCheck #6663

Merged

Conversation

niklasberglund
Copy link
Collaborator

@niklasberglund niklasberglund commented Aug 22, 2024

This PR enables testConnectAndVerifyWithConnectionCheck and adds a wait for the out IP address to show before attempting to extract it. It is valid that it in some cases take a while for it to show.

There is also a small fix for login button sometimes being pressed before it has been enabled.


This change is Reviewable

@niklasberglund niklasberglund added the Android Issues related to Android label Aug 22, 2024
@niklasberglund niklasberglund self-assigned this Aug 22, 2024
Copy link

linear bot commented Aug 22, 2024

@niklasberglund niklasberglund force-pushed the fix-failing-test-testconnectandverifywithconnectioncheck-droid-1262 branch from 13be217 to 5ed58c2 Compare August 22, 2024 15:29
@niklasberglund niklasberglund changed the title Fix failing test testconnectandverifywithconnectioncheck droid 1262 Re-enable and fix testConnectAndVerifyWithConnectionCheck Aug 22, 2024
@niklasberglund niklasberglund force-pushed the fix-failing-test-testconnectandverifywithconnectioncheck-droid-1262 branch from 5ed58c2 to 09808a9 Compare August 22, 2024 15:31
albin-mullvad
albin-mullvad previously approved these changes Aug 22, 2024
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Pururun
Pururun previously approved these changes Aug 23, 2024
Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@niklasberglund niklasberglund dismissed stale reviews from Pururun and albin-mullvad via 73a06cb August 23, 2024 07:49
@niklasberglund niklasberglund force-pushed the fix-failing-test-testconnectandverifywithconnectioncheck-droid-1262 branch 9 times, most recently from 4dee0fd to b7cffbb Compare August 26, 2024 10:44
Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 2 files at r2, 1 of 1 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @niklasberglund)


android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt line 28 at r3 (raw file):

            try {
                device.findObjectWithTimeout(By.text(FORGET_VPN_VPN_BUTTON_TEXT)).click()

Maybe I misunderstood something, but this means that it will always try to click on both possible texts?

Copy link
Collaborator Author

@niklasberglund niklasberglund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt line 28 at r3 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Maybe I misunderstood something, but this means that it will always try to click on both possible texts?

The idea is that it first attempts to click "Forget VPN" and "Forget", but if that fails it will instead click "Delete VPN profile" and "DELETE".

Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt line 28 at r3 (raw file):

Previously, niklasberglund (Niklas Berglund) wrote…

The idea is that it first attempts to click "Forget VPN" and "Forget", but if that fails it will instead click "Delete VPN profile" and "DELETE".

Right, I missed that it needs to click on the confirm button as well. My bad.

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 2 files at r2, 1 of 1 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa force-pushed the fix-failing-test-testconnectandverifywithconnectioncheck-droid-1262 branch from b7cffbb to 2e280c7 Compare August 27, 2024 15:10
@Rawa Rawa merged commit e1af89b into main Aug 27, 2024
24 checks passed
@Rawa Rawa deleted the fix-failing-test-testconnectandverifywithconnectioncheck-droid-1262 branch August 27, 2024 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants