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

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

Issue 4274003: Marking ExtensionAPiTest.ProcessesVsTaskManager as flaky. It appears to fail ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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) 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/browser.h" 6 #include "chrome/browser/browser.h"
7 #include "chrome/browser/browser_window.h" 7 #include "chrome/browser/browser_window.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/task_manager/task_manager.h" 10 #include "chrome/browser/task_manager/task_manager.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 12
13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { 13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) {
14 CommandLine::ForCurrentProcess()->AppendSwitch( 14 CommandLine::ForCurrentProcess()->AppendSwitch(
15 switches::kEnableExperimentalExtensionApis); 15 switches::kEnableExperimentalExtensionApis);
16 16
17 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; 17 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
18 } 18 }
19 19
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { 20 #if defined(OS_WIN)
21 // Likely related to http://crbug.com/44991
22 #define MAYBE_ProcessesVsTaskManager FLAKY_ProcessesVsTaskManager
23 #else
24 #define MAYBE_ProcessesVsTaskManager ProcessesVsTaskManager
25 #endif
26
27 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ProcessesVsTaskManager) {
21 CommandLine::ForCurrentProcess()->AppendSwitch( 28 CommandLine::ForCurrentProcess()->AppendSwitch(
22 switches::kEnableExperimentalExtensionApis); 29 switches::kEnableExperimentalExtensionApis);
23 30
24 // Ensure task manager is not yet updating 31 // Ensure task manager is not yet updating
25 TaskManagerModel* model = TaskManager::GetInstance()->model(); 32 TaskManagerModel* model = TaskManager::GetInstance()->model();
26 EXPECT_EQ(0, model->update_requests_); 33 EXPECT_EQ(0, model->update_requests_);
27 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_); 34 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_);
28 35
29 // Load extension that adds listener in background page 36 // Load extension that adds listener in background page
30 ExtensionTestMessageListener listener("ready", false); 37 ExtensionTestMessageListener listener("ready", false);
31 ASSERT_TRUE(LoadExtension( 38 ASSERT_TRUE(LoadExtension(
32 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 39 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
33 ASSERT_TRUE(listener.WaitUntilSatisfied()); 40 ASSERT_TRUE(listener.WaitUntilSatisfied());
34 41
35 // Ensure the task manager has started updating 42 // Ensure the task manager has started updating
36 EXPECT_EQ(1, model->update_requests_); 43 EXPECT_EQ(1, model->update_requests_);
37 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 44 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
38 45
39 // Now show the task manager 46 // Now show the task manager
40 browser()->window()->ShowTaskManager(); 47 browser()->window()->ShowTaskManager();
41 EXPECT_EQ(2, model->update_requests_); 48 EXPECT_EQ(2, model->update_requests_);
42 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 49 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
43 50
44 // Unload the extension and check that listener count decreases 51 // Unload the extension and check that listener count decreases
45 UnloadExtension(last_loaded_extension_id_); 52 UnloadExtension(last_loaded_extension_id_);
46 EXPECT_EQ(1, model->update_requests_); 53 EXPECT_EQ(1, model->update_requests_);
47 } 54 }
48 55
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