Commit 5a8dcee3 authored by Toni Barzic's avatar Toni Barzic Committed by Commit Bot

Enable OobeInteractiveUI SimeEndToEnd test

This fixes a race in GaiaScreenHandler method for setting test user
credentials not to start AddUserFlow (and force GAIA reload) if the auth
extension load has started (in addition to when the gaia frame started
loading) - this was causing issues because the flow would clear up the
current sign-in partition, without stopping the current auth extension
load (and later attempt to authenticate would crash on current signin
storage partition session being empty).
NOTE: This is a wider issue that I plan to look more closely into, but
this change should unblock tests.

BUG=936041,891277

Change-Id: Ie1f76daf0278af59af8b85c4a0fd82b9b0223555
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1560534
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Auto-Submit: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649650}
parent 6f138f9d
...@@ -373,9 +373,7 @@ void OobeInteractiveUITest::SimpleEndToEnd() { ...@@ -373,9 +373,7 @@ void OobeInteractiveUITest::SimpleEndToEnd() {
WaitForLoginDisplayHostShutdown(); WaitForLoginDisplayHostShutdown();
} }
// Flaky on MSAN/ASAN/LSAN: crbug.com/891277, crbug.com/891484. IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, SimpleEndToEnd) {
// Flaky on normal builds: crbug.com/936041
IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, DISABLED_SimpleEndToEnd) {
SimpleEndToEnd(); SimpleEndToEnd();
} }
......
...@@ -1116,7 +1116,8 @@ void GaiaScreenHandler::ShowSigninScreenForTest(const std::string& username, ...@@ -1116,7 +1116,8 @@ void GaiaScreenHandler::ShowSigninScreenForTest(const std::string& username,
// reload gaia then follow the loading case. // reload gaia then follow the loading case.
if (frame_state() == GaiaScreenHandler::FRAME_STATE_LOADED) { if (frame_state() == GaiaScreenHandler::FRAME_STATE_LOADED) {
SubmitLoginFormForTest(); SubmitLoginFormForTest();
} else if (frame_state() != GaiaScreenHandler::FRAME_STATE_LOADING) { } else if (frame_state() != GaiaScreenHandler::FRAME_STATE_LOADING &&
!auth_extension_being_loaded_) {
OnShowAddUser(); OnShowAddUser();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment