Commit fb3431ea authored by Joshua Pawlicki's avatar Joshua Pawlicki Committed by Commit Bot

Disable AssistantOptInFlowTest for debug builds.

TBR=tbarzic@chromium.org

Bug: 1022021
Change-Id: Icc814fe9a8de25d42e2597ce1e323e1b1438f00d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1901594Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713130}
parent 21412d5c
......@@ -481,7 +481,15 @@ class AssistantOptInFlowTest : public MixinBasedInProcessBrowserTest {
LoginManagerMixin login_manager_{&mixin_host_, {test_user_}};
};
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, Basic) {
// Test times out in debug builds. crbug.com/1022021
#if !defined(NDEBUG)
#define MAYBE_AssistantOptInFlowTest DISABLED_AssistantOptInFlowTest
class DISABLED_AssistantOptInFlowTest : public AssistantOptInFlowTest {};
#else
#define MAYBE_AssistantOptInFlowTest AssistantOptInFlowTest
#endif
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, Basic) {
ash::AssistantState::Get()->NotifyStatusChanged(
ash::mojom::AssistantState::READY);
......@@ -517,7 +525,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, Basic) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, DisableScreenContext) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, DisableScreenContext) {
ash::AssistantState::Get()->NotifyStatusChanged(
ash::mojom::AssistantState::READY);
......@@ -557,7 +565,8 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, DisableScreenContext) {
EXPECT_FALSE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantStateUpdateAfterShow) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
AssistantStateUpdateAfterShow) {
SetUpAssistantScreensForTest();
assistant_optin_flow_screen_->Show();
......@@ -595,7 +604,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantStateUpdateAfterShow) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
SetUpAssistantScreensForTest();
fail_next_value_prop_url_request_ = true;
......@@ -635,7 +644,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RejectValueProp) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, RejectValueProp) {
SetUpAssistantScreensForTest();
ash::AssistantState::Get()->NotifyStatusChanged(
ash::mojom::AssistantState::READY);
......@@ -659,7 +668,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RejectValueProp) {
EXPECT_FALSE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_ASK_EMAIL_OPT_IN);
ash::AssistantState::Get()->NotifyStatusChanged(
......@@ -700,7 +709,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_ASK_EMAIL_OPT_IN);
ash::AssistantState::Get()->NotifyStatusChanged(
......@@ -744,7 +753,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SkipShowingValueProp) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, SkipShowingValueProp) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL);
......@@ -777,7 +786,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SkipShowingValueProp) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
SkipShowingValuePropAndThirdPartyDisclosure) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
......@@ -809,7 +818,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SpeakerIdEnrollment) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, SpeakerIdEnrollment) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_THIRD_PARTY_DISCLOSURE);
......@@ -898,7 +907,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SpeakerIdEnrollment) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
BailOutDuringSpeakerIdEnrollment) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
......@@ -950,7 +959,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
SpeakerIdEnrollmentFailureAndRetry) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
......@@ -1006,7 +1015,7 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, WAADisabledByPolicy) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, WAADisabledByPolicy) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_WAA_DISABLED_BY_POLICY);
......@@ -1024,7 +1033,8 @@ IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, WAADisabledByPolicy) {
EXPECT_FALSE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantDisabledByPolicy) {
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
AssistantDisabledByPolicy) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_ASSISTANT_DISABLED_BY_POLICY);
......
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