Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_apitest.cc

Issue 2544323002: Also disable ExtensionWebRequestApiTest.WebRequestBlocking on ASAN and MSAN builds due to timeouts. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, 225 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
226 DISABLED_WebRequestAuthRequired) { 226 DISABLED_WebRequestAuthRequired) {
227 CancelLoginDialog login_dialog_helper; 227 CancelLoginDialog login_dialog_helper;
228 228
229 ASSERT_TRUE(StartEmbeddedTestServer()); 229 ASSERT_TRUE(StartEmbeddedTestServer());
230 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << 230 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) <<
231 message_; 231 message_;
232 } 232 }
233 233
234 // This test times out regularly on win_rel trybots. See http://crbug.com/122178 234 // This test times out regularly on win_rel trybots. See http://crbug.com/122178
235 // Also on Linux/ChromiumOS debug builds. https://crbug.com/670415 235 // Also on Linux/ChromiumOS debug, ASAN and MSAN builds.
236 #if defined(OS_WIN) || !defined(NDEBUG) 236 // https://crbug.com/670415
237 #if defined(OS_WIN) || !defined(NDEBUG) || defined(ADDRESS_SANITIZER) || \
238 defined(MEMORY_SANITIZER)
237 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking 239 #define MAYBE_WebRequestBlocking DISABLED_WebRequestBlocking
238 #else 240 #else
239 #define MAYBE_WebRequestBlocking WebRequestBlocking 241 #define MAYBE_WebRequestBlocking WebRequestBlocking
240 #endif 242 #endif
241 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) { 243 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestBlocking) {
242 ASSERT_TRUE(StartEmbeddedTestServer()); 244 ASSERT_TRUE(StartEmbeddedTestServer());
243 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << 245 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) <<
244 message_; 246 message_;
245 } 247 }
246 248
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 ASSERT_TRUE(granter); 646 ASSERT_TRUE(granter);
645 granter->RevokeForTesting(); 647 granter->RevokeForTesting();
646 base::RunLoop().RunUntilIdle(); 648 base::RunLoop().RunUntilIdle();
647 PerformXhrInFrame(main_frame, kHost, port, kXhrPath); 649 PerformXhrInFrame(main_frame, kHost, port, kXhrPath);
648 EXPECT_EQ(xhr_count, 650 EXPECT_EQ(xhr_count,
649 GetWebRequestCountFromBackgroundPage(extension, profile())); 651 GetWebRequestCountFromBackgroundPage(extension, profile()));
650 EXPECT_EQ(BLOCKED_ACTION_WEB_REQUEST, runner->GetBlockedActions(extension)); 652 EXPECT_EQ(BLOCKED_ACTION_WEB_REQUEST, runner->GetBlockedActions(extension));
651 } 653 }
652 654
653 } // namespace extensions 655 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698