Commit 75d5990c authored by asargent's avatar asargent Committed by Commit bot

Temporarily disable some extensions management tests in official builds

These are failing on the official builders. A fix for that is out for
review, but in the mean time this disables those tests to get the bots
green.

BUG=567497
TBR=rockot@chromium.org

Review URL: https://codereview.chromium.org/1513573008

Cr-Commit-Position: refs/heads/master@{#364431}
parent 21e37370
......@@ -233,8 +233,14 @@ class ExtensionManagementApiEscalationTest :
const char ExtensionManagementApiEscalationTest::kId[] =
"pgdpcfcocojkjfbgpiianjngphoopgmo";
// Temporarily disabled in official builds. See crbug.com/567497 for details.
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
#define MAYBE_DisabledReason DISABLED_DisabledReason
#else
#define MAYBE_DisabledReason DisabledReason
#endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
DisabledReason) {
MAYBE_DisabledReason) {
scoped_refptr<ManagementGetFunction> function =
new ManagementGetFunction();
scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult(
......@@ -250,8 +256,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
EXPECT_EQ(reason, std::string(keys::kDisabledReasonPermissionsIncrease));
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
SetEnabled) {
// Temporarily disabled in official builds. See crbug.com/567497 for details.
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
#define MAYBE_SetEnabled DISABLED_SetEnabled
#else
#define MAYBE_SetEnabled SetEnabled
#endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest, MAYBE_SetEnabled) {
// Expect an error about no gesture.
SetEnabled(true, false, keys::kGestureNeededForEscalationError);
......
......@@ -435,7 +435,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
notification_listener.Reset();
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
// Temporarily disabled in official builds. See crbug.com/567497 for details.
#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
#define MAYBE_ExternalUrlUpdate DISABLED_ExternalUrlUpdate
#else
#define MAYBE_ExternalUrlUpdate ExternalUrlUpdate
#endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_ExternalUrlUpdate) {
ExtensionService* service = extensions::ExtensionSystem::Get(
browser()->profile())->extension_service();
const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
......
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