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

Side by Side Diff: chrome/browser/extensions/extension_tabs_apitest.cc

Issue 3011005: Marking ExtensionApiTest.TabOnRemove flaky. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: Created 10 years, 5 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "chrome/browser/browser.h" 7 #include "chrome/browser/browser.h"
8 #include "chrome/browser/pref_service.h" 8 #include "chrome/browser/pref_service.h"
9 #include "chrome/browser/profile.h" 9 #include "chrome/browser/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 11
12 // Tabs is flaky on chromeos and linux views debug build. 12 // Tabs is flaky on chromeos and linux views debug build.
13 // http://crbug.com/48920 13 // http://crbug.com/48920
14 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) && !defined(NDEBUG) 14 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) && !defined(NDEBUG)
15 #define MAYBE_Tabs FLAKY_Tabs 15 #define MAYBE_Tabs FLAKY_Tabs
16 #else 16 #else
17 #define MAYBE_Tabs Tabs 17 #define MAYBE_Tabs Tabs
18 #endif 18 #endif
19 19
20 // TabOnRemoved is flaky on chromeos and linux views debug build.
21 // http://crbug.com/49258
22 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) && !defined(NDEBUG)
23 #define MAYBE_TabOnRemoved FLAKY_TabOnRemoved
24 #else
25 #define MAYBE_TabOnRemoved TabOnRemoved
26 #endif
27
20 28
21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { 29 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
22 ASSERT_TRUE(StartHTTPServer()); 30 ASSERT_TRUE(StartHTTPServer());
23 31
24 // The test creates a tab and checks that the URL of the new tab 32 // The test creates a tab and checks that the URL of the new tab
25 // is that of the new tab page. Make sure the pref that controls 33 // is that of the new tab page. Make sure the pref that controls
26 // this is set. 34 // this is set.
27 browser()->profile()->GetPrefs()->SetBoolean( 35 browser()->profile()->GetPrefs()->SetBoolean(
28 prefs::kHomePageIsNewTabPage, true); 36 prefs::kHomePageIsNewTabPage, true);
29 37
30 ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_; 38 ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_;
31 } 39 }
32 40
33 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { 41 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) {
34 ASSERT_TRUE(StartHTTPServer()); 42 ASSERT_TRUE(StartHTTPServer());
35 ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; 43 ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_;
36 } 44 }
37 45
38 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { 46 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) {
39 ASSERT_TRUE(StartHTTPServer()); 47 ASSERT_TRUE(StartHTTPServer());
40 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; 48 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_;
41 } 49 }
42 50
43 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabOnRemoved) { 51 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) {
44 ASSERT_TRUE(StartHTTPServer()); 52 ASSERT_TRUE(StartHTTPServer());
45 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; 53 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_;
46 } 54 }
47 55
48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { 56 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) {
49 ASSERT_TRUE(StartHTTPServer()); 57 ASSERT_TRUE(StartHTTPServer());
50 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; 58 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_;
51 } 59 }
52 60
53 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { 61 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) {
54 ASSERT_TRUE(StartHTTPServer()); 62 ASSERT_TRUE(StartHTTPServer());
55 63
56 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; 64 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_;
57 } 65 }
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