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

Side by Side Diff: chrome/browser/extensions/api/automation/automation_apitest.cc

Issue 336423002: Disables the Actions test on linux ASAN (flakiness). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months 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 | Annotate | Revision Log
« 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_test_message_listener.h" 9 #include "chrome/browser/extensions/extension_test_message_listener.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "tab_id.html")) 103 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "tab_id.html"))
104 << message_; 104 << message_;
105 } 105 }
106 106
107 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Events) { 107 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Events) {
108 StartEmbeddedTestServer(); 108 StartEmbeddedTestServer();
109 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "events.html")) 109 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "events.html"))
110 << message_; 110 << message_;
111 } 111 }
112 112
113 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Actions) { 113 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
114 // Timing out on linux ASan bot: http://crbug.com/385701
115 #define MAYBE_Actions DISABLED_Actions
116 #else
117 #define MAYBE_Actions Actions
118 #endif
119
120 IN_PROC_BROWSER_TEST_F(AutomationApiTest, MAYBE_Actions) {
114 StartEmbeddedTestServer(); 121 StartEmbeddedTestServer();
115 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "actions.html")) 122 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "actions.html"))
116 << message_; 123 << message_;
117 } 124 }
118 125
119 #if defined(ADDRESS_SANITIZER) 126 #if defined(ADDRESS_SANITIZER)
120 #define Maybe_Location DISABLED_Location 127 #define Maybe_Location DISABLED_Location
121 #else 128 #else
122 #define Maybe_Location Location 129 #define Maybe_Location Location
123 #endif 130 #endif
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 << message_; 177 << message_;
171 } 178 }
172 #else 179 #else
173 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) { 180 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) {
174 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", 181 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop",
175 "desktop_not_supported.html")) << message_; 182 "desktop_not_supported.html")) << message_;
176 } 183 }
177 #endif 184 #endif
178 185
179 } // namespace extensions 186 } // 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