Commit 18d49bb1 authored by David Bertoni's avatar David Bertoni Committed by Commit Bot

[Extensions] Re-enable an execute script test.

ExecuteScriptApiTest.ExecuteScriptPermissions was disabled for
flakiness on Windows. Recent changes made to clean this test up
have de-flaked it. It passed 3000 iterations on the bots without
any flakes.

Bug: 174715
Change-Id: I54e231b6dce37edd5cc0cea3df6e021e554cf10c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2375012Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802420}
parent 69c619b4
...@@ -32,6 +32,8 @@ class ExecuteScriptApiTest : public ExecuteScriptApiTestBase, ...@@ -32,6 +32,8 @@ class ExecuteScriptApiTest : public ExecuteScriptApiTestBase,
public testing::WithParamInterface<ContextType> { public testing::WithParamInterface<ContextType> {
protected: protected:
ExecuteScriptApiTest() { ExecuteScriptApiTest() {
// Service Workers are currently only available on certain channels, so set
// the channel for those tests.
if (GetParam() == ContextType::kServiceWorker) if (GetParam() == ContextType::kServiceWorker)
current_channel_ = std::make_unique<ScopedWorkerBasedExtensionsChannel>(); current_channel_ = std::make_unique<ScopedWorkerBasedExtensionsChannel>();
} }
...@@ -87,14 +89,7 @@ IN_PROC_BROWSER_TEST_P(ExecuteScriptApiTest, ExecuteScriptByFrameId) { ...@@ -87,14 +89,7 @@ IN_PROC_BROWSER_TEST_P(ExecuteScriptApiTest, ExecuteScriptByFrameId) {
ASSERT_TRUE(RunTest("executescript/frame_id")) << message_; ASSERT_TRUE(RunTest("executescript/frame_id")) << message_;
} }
// Fails often on Windows. IN_PROC_BROWSER_TEST_P(ExecuteScriptApiTest, ExecuteScriptPermissions) {
// http://crbug.com/174715
#if defined(OS_WIN)
#define MAYBE_ExecuteScriptPermissions DISABLED_ExecuteScriptPermissions
#else
#define MAYBE_ExecuteScriptPermissions ExecuteScriptPermissions
#endif // defined(OS_WIN)
IN_PROC_BROWSER_TEST_P(ExecuteScriptApiTest, MAYBE_ExecuteScriptPermissions) {
// TODO(https://crbug.com/1115182): Flaky for SW-based extensions. // TODO(https://crbug.com/1115182): Flaky for SW-based extensions.
if (GetParam() == ContextType::kServiceWorker) if (GetParam() == ContextType::kServiceWorker)
return; return;
......
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