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

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

Issue 1014543006: Disable AutomationApiTest.Mixin on Linux due to flakiness (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« 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/api/automation_internal/automation_util.h" 8 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
9 #include "chrome/browser/extensions/chrome_extension_function.h" 9 #include "chrome/browser/extensions/chrome_extension_function.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 RunExtensionSubtest("automation/tests/tabs", "queryselector.html")) 180 RunExtensionSubtest("automation/tests/tabs", "queryselector.html"))
181 << message_; 181 << message_;
182 } 182 }
183 183
184 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Find) { 184 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Find) {
185 StartEmbeddedTestServer(); 185 StartEmbeddedTestServer();
186 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "find.html")) 186 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "find.html"))
187 << message_; 187 << message_;
188 } 188 }
189 189
190 // Flaky on Linux only. http://crbug.com/467921
191 #if defined(OS_LINUX)
192 #define MAYBE_Mixins DISABLED_Mixins
193 #else
194 #define MAYBE_Mixins Mixins
195 #endif
190 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Mixins) { 196 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Mixins) {
191 StartEmbeddedTestServer(); 197 StartEmbeddedTestServer();
192 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "mixins.html")) 198 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "mixins.html"))
193 << message_; 199 << message_;
194 } 200 }
195 201
196 202
197 static const int kPid = 1; 203 static const int kPid = 1;
198 static const int kTab0Rid = 1; 204 static const int kTab0Rid = 1;
199 static const int kTab1Rid = 2; 205 static const int kTab1Rid = 2;
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 "automationInternal.enableTab", 518 "automationInternal.enableTab",
513 FakeAutomationInternalEnableTabFunctionFactory)); 519 FakeAutomationInternalEnableTabFunctionFactory));
514 ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction( 520 ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
515 "automationInternal.performAction", 521 "automationInternal.performAction",
516 FakeAutomationInternalPerformActionFunctionFactory)); 522 FakeAutomationInternalPerformActionFunctionFactory));
517 ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated", 523 ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated",
518 "generated_trees.html")) << message_; 524 "generated_trees.html")) << message_;
519 } 525 }
520 526
521 } // namespace extensions 527 } // 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