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

Side by Side Diff: chrome/browser/history/history_extension_apitest.cc

Issue 9863022: Disable flaky tests that were re-enabled in r128299 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 (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/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "net/base/mock_host_resolver.h" 8 #include "net/base/mock_host_resolver.h"
9 9
10 class HistoryExtensionApiTest : public ExtensionApiTest { 10 class HistoryExtensionApiTest : public ExtensionApiTest {
11 public: 11 public:
12 virtual void SetUpInProcessBrowserTestFixture() { 12 virtual void SetUpInProcessBrowserTestFixture() {
13 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 13 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
14 14
15 host_resolver()->AddRule("www.a.com", "127.0.0.1"); 15 host_resolver()->AddRule("www.a.com", "127.0.0.1");
16 host_resolver()->AddRule("www.b.com", "127.0.0.1"); 16 host_resolver()->AddRule("www.b.com", "127.0.0.1");
17 17
18 ASSERT_TRUE(StartTestServer()); 18 ASSERT_TRUE(StartTestServer());
19 } 19 }
20 }; 20 };
21 21
22 // Full text search indexing sometimes exceeds a timeout. (http://crbug/119505) 22 // Full text search indexing sometimes exceeds a timeout. (http://crbug/119505)
23 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MiscSearch) { 23 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_MiscSearch) {
24 ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_; 24 ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_;
25 } 25 }
26 26
27 // Same could happen here without the FTS (http://crbug/119505) 27 // Same could happen here without the FTS (http://crbug/119505)
28 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, TimedSearch) { 28 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_TimedSearch) {
29 ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_; 29 ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_;
30 } 30 }
31 31
32 #if defined(OS_WIN) 32 #if defined(OS_WIN)
33 // Flaky on Windows: crbug.com/88318 33 // Flaky on Windows: crbug.com/88318
34 #define MAYBE_Delete DISABLED_Delete 34 #define MAYBE_Delete DISABLED_Delete
35 #else 35 #else
36 #define MAYBE_Delete Delete 36 #define MAYBE_Delete Delete
37 #endif 37 #endif
38 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_Delete) { 38 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_Delete) {
(...skipping 10 matching lines...) Expand all
49 // Fix this as part of crbug/76170. 49 // Fix this as part of crbug/76170.
50 #define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd 50 #define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd
51 #else 51 #else
52 #define MAYBE_SearchAfterAdd SearchAfterAdd 52 #define MAYBE_SearchAfterAdd SearchAfterAdd
53 #endif 53 #endif
54 54
55 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_SearchAfterAdd) { 55 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_SearchAfterAdd) {
56 ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html")) 56 ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html"))
57 << message_; 57 << message_;
58 } 58 }
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