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

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

Issue 405233002: Disable two tests that are timing out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "chrome/browser/extensions/extension_test_message_listener.h" 6 #include "chrome/browser/extensions/extension_test_message_listener.h"
7 7
8 using extensions::Extension; 8 using extensions::Extension;
9 9
10 // NB: We use LoadExtension instead of InstallExtension for shared modules so 10 // NB: We use LoadExtension instead of InstallExtension for shared modules so
11 // the public-keys in their manifests are used to generate the extension ID, so 11 // the public-keys in their manifests are used to generate the extension ID, so
12 // it can be imported correctly. We use InstallExtension otherwise so the loads 12 // it can be imported correctly. We use InstallExtension otherwise so the loads
13 // happen through the CRX installer which validates imports. 13 // happen through the CRX installer which validates imports.
14 14
15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModule) { 15 // Timing out on Win7 Tests bot. See http://crbug.com/395796 .
16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SharedModule) {
16 // import_pass depends on this shared module. 17 // import_pass depends on this shared module.
17 ASSERT_TRUE(LoadExtension( 18 ASSERT_TRUE(LoadExtension(
18 test_data_dir_.AppendASCII("shared_module").AppendASCII("shared"))); 19 test_data_dir_.AppendASCII("shared_module").AppendASCII("shared")));
19 20
20 EXPECT_TRUE(RunExtensionTest("shared_module/import_pass")); 21 EXPECT_TRUE(RunExtensionTest("shared_module/import_pass"));
21 22
22 EXPECT_FALSE(InstallExtension( 23 EXPECT_FALSE(InstallExtension(
23 test_data_dir_.AppendASCII("shared_module") 24 test_data_dir_.AppendASCII("shared_module")
24 .AppendASCII("import_wrong_version"), 0)); 25 .AppendASCII("import_wrong_version"), 0));
25 EXPECT_FALSE(InstallExtension( 26 EXPECT_FALSE(InstallExtension(
26 test_data_dir_.AppendASCII("shared_module") 27 test_data_dir_.AppendASCII("shared_module")
27 .AppendASCII("import_non_existent"), 0)); 28 .AppendASCII("import_non_existent"), 0));
28 } 29 }
29 30
30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleWhitelist) { 31 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleWhitelist) {
31 ASSERT_TRUE(LoadExtension( 32 ASSERT_TRUE(LoadExtension(
32 test_data_dir_.AppendASCII("shared_module") 33 test_data_dir_.AppendASCII("shared_module")
33 .AppendASCII("shared_whitelist"))); 34 .AppendASCII("shared_whitelist")));
34 35
35 EXPECT_FALSE(InstallExtension( 36 EXPECT_FALSE(InstallExtension(
36 test_data_dir_.AppendASCII("shared_module") 37 test_data_dir_.AppendASCII("shared_module")
37 .AppendASCII("import_not_in_whitelist"), 0)); 38 .AppendASCII("import_not_in_whitelist"), 0));
38 } 39 }
39 40
40 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleInstallEvent) { 41 // Timing out on Win7 Tests bot. See http://crbug.com/395796 .
42 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SharedModuleInstallEvent) {
41 ExtensionTestMessageListener listener1("ready", false); 43 ExtensionTestMessageListener listener1("ready", false);
42 44
43 const Extension* extension = LoadExtension( 45 const Extension* extension = LoadExtension(
44 test_data_dir_.AppendASCII("shared_module").AppendASCII("shared")); 46 test_data_dir_.AppendASCII("shared_module").AppendASCII("shared"));
45 ASSERT_TRUE(extension); 47 ASSERT_TRUE(extension);
46 ASSERT_TRUE(InstallExtension( 48 ASSERT_TRUE(InstallExtension(
47 test_data_dir_.AppendASCII("shared_module").AppendASCII("import_pass"), 49 test_data_dir_.AppendASCII("shared_module").AppendASCII("import_pass"),
48 1)); 50 1));
49 51
50 EXPECT_TRUE(listener1.WaitUntilSatisfied()); 52 EXPECT_TRUE(listener1.WaitUntilSatisfied());
51 53
52 ExtensionTestMessageListener listener2("shared_module_updated", false); 54 ExtensionTestMessageListener listener2("shared_module_updated", false);
53 ReloadExtension(extension->id()); 55 ReloadExtension(extension->id());
54 56
55 EXPECT_TRUE(listener2.WaitUntilSatisfied()); 57 EXPECT_TRUE(listener2.WaitUntilSatisfied());
56 } 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