Commit 4d441101 authored by Tina Wang's avatar Tina Wang Committed by Commit Bot

Disabled SyncConsentTestWithParams.SyncConsentTestWithLocale

Because of consistently timing out on linux.

Bug: 1025213
Tbr: xuyuan@chromium.org
Change-Id: Id7e031f6ee29f0ef7d7a9484a2ca5dab242a701e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918115Reviewed-by: default avatarTina Wang <tinazwang@chromium.org>
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715776}
parent 05315a71
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/screens/assistant_optin_flow_screen.h" #include "chrome/browser/chromeos/login/screens/assistant_optin_flow_screen.h"
#include "chrome/browser/chromeos/login/screens/sync_consent_screen.h" #include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
...@@ -230,7 +231,14 @@ class SyncConsentTestWithParams ...@@ -230,7 +231,14 @@ class SyncConsentTestWithParams
DISALLOW_COPY_AND_ASSIGN(SyncConsentTestWithParams); DISALLOW_COPY_AND_ASSIGN(SyncConsentTestWithParams);
}; };
IN_PROC_BROWSER_TEST_P(SyncConsentTestWithParams, SyncConsentTestWithLocale) { // Consistently timing out on linux http://crbug.com/1025213
#if defined(OS_LINUX)
#define MAYBE_SyncConsentTestWithLocale DISABLED_SyncConsentTestWithLocale
#else
#define MAYBE_SyncConsentTestWithLocale SyncConsentTestWithLocale
#endif
IN_PROC_BROWSER_TEST_P(SyncConsentTestWithParams,
MAYBE_SyncConsentTestWithLocale) {
LOG(INFO) << "SyncConsentTestWithParams() started with param='" << GetParam() LOG(INFO) << "SyncConsentTestWithParams() started with param='" << GetParam()
<< "'"; << "'";
EXPECT_EQ(g_browser_process->GetApplicationLocale(), "en-US"); EXPECT_EQ(g_browser_process->GetApplicationLocale(), "en-US");
......
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