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

Side by Side Diff: content/browser/gpu/gpu_crash_browsertest.cc

Issue 12114037: Mark a bunch of tests as failures. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | content/test/data/gpu/webgl_conformance_test_expectations.txt » ('j') | 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/path_service.h" 5 #include "base/path_service.h"
6 #include "content/browser/gpu/gpu_data_manager_impl.h" 6 #include "content/browser/gpu/gpu_data_manager_impl.h"
7 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 7 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
8 #include "content/public/browser/notification_service.h" 8 #include "content/public/browser/notification_service.h"
9 #include "content/public/browser/notification_types.h" 9 #include "content/public/browser/notification_types.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
11 #include "content/public/test/browser_test_utils.h" 11 #include "content/public/test/browser_test_utils.h"
12 #include "content/public/test/test_utils.h" 12 #include "content/public/test/test_utils.h"
13 #include "content/shell/shell.h" 13 #include "content/shell/shell.h"
14 #include "content/test/content_browser_test.h" 14 #include "content/test/content_browser_test.h"
15 #include "content/test/content_browser_test_utils.h" 15 #include "content/test/content_browser_test_utils.h"
16 16
17 namespace content { 17 namespace content {
18 class GpuCrashTest : public ContentBrowserTest { 18 class GpuCrashTest : public ContentBrowserTest {
19 protected: 19 protected:
20 virtual void SetUpInProcessBrowserTestFixture() { 20 virtual void SetUpInProcessBrowserTestFixture() {
21 FilePath test_dir; 21 FilePath test_dir;
22 ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir)); 22 ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir));
23 gpu_test_dir_ = test_dir.AppendASCII("gpu"); 23 gpu_test_dir_ = test_dir.AppendASCII("gpu");
24 } 24 }
25 FilePath gpu_test_dir_; 25 FilePath gpu_test_dir_;
26 }; 26 };
27 27
28 IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_Kill) { 28 IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_Kill) {
29 #if defined(OS_MACOSX)
30 // crbug.com/173456
31 return;
32 #endif
33
29 DOMMessageQueue message_queue; 34 DOMMessageQueue message_queue;
30 35
31 content::GpuDataManagerImpl::GetInstance()-> 36 content::GpuDataManagerImpl::GetInstance()->
32 DisableDomainBlockingFor3DAPIsForTesting(); 37 DisableDomainBlockingFor3DAPIsForTesting();
33 38
34 // Load page and wait for it to load. 39 // Load page and wait for it to load.
35 content::WindowedNotificationObserver observer( 40 content::WindowedNotificationObserver observer(
36 content::NOTIFICATION_LOAD_STOP, 41 content::NOTIFICATION_LOAD_STOP,
37 content::NotificationService::AllSources()); 42 content::NotificationService::AllSources());
38 NavigateToURL( 43 NavigateToURL(
39 shell(), 44 shell(),
40 GetFileUrlWithQuery( 45 GetFileUrlWithQuery(
41 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill")); 46 gpu_test_dir_.AppendASCII("webgl.html"), "query=kill"));
42 observer.Wait(); 47 observer.Wait();
43 48
44 GpuProcessHostUIShim* host = 49 GpuProcessHostUIShim* host =
45 GpuProcessHostUIShim::GetOneInstance(); 50 GpuProcessHostUIShim::GetOneInstance();
46 ASSERT_TRUE(host); 51 ASSERT_TRUE(host);
47 host->SimulateCrash(); 52 host->SimulateCrash();
48 53
49 std::string m; 54 std::string m;
50 ASSERT_TRUE(message_queue.WaitForMessage(&m)); 55 ASSERT_TRUE(message_queue.WaitForMessage(&m));
51 EXPECT_EQ("\"SUCCESS\"", m); 56 EXPECT_EQ("\"SUCCESS\"", m);
52 } 57 }
53 58
54 IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_WebkitLoseContext) { 59 IN_PROC_BROWSER_TEST_F(GpuCrashTest, MANUAL_WebkitLoseContext) {
60 #if defined(OS_MACOSX)
61 // crbug.com/173456
62 return;
63 #endif
64
55 DOMMessageQueue message_queue; 65 DOMMessageQueue message_queue;
56 66
57 NavigateToURL( 67 NavigateToURL(
58 shell(), 68 shell(),
59 GetFileUrlWithQuery( 69 GetFileUrlWithQuery(
60 gpu_test_dir_.AppendASCII("webgl.html"), 70 gpu_test_dir_.AppendASCII("webgl.html"),
61 "query=WEBGL_lose_context")); 71 "query=WEBGL_lose_context"));
62 72
63 std::string m; 73 std::string m;
64 ASSERT_TRUE(message_queue.WaitForMessage(&m)); 74 ASSERT_TRUE(message_queue.WaitForMessage(&m));
65 EXPECT_EQ("\"SUCCESS\"", m); 75 EXPECT_EQ("\"SUCCESS\"", m);
66 } 76 }
67 77
68 } // namespace content 78 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/data/gpu/webgl_conformance_test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698