OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/file_path.h" | 5 #include "base/file_path.h" |
6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "base/threading/platform_thread.h" | 8 #include "base/threading/platform_thread.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/test/automation/automation_proxy.h" | 10 #include "chrome/test/automation/automation_proxy.h" |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 worker_test_dir = worker_test_dir.AppendASCII("workers"); | 463 worker_test_dir = worker_test_dir.AppendASCII("workers"); |
464 InitializeForLayoutTest(http_test_dir, worker_test_dir, kHttpPort); | 464 InitializeForLayoutTest(http_test_dir, worker_test_dir, kHttpPort); |
465 | 465 |
466 LayoutTestHttpServer http_server(new_http_root_dir_, kHttpPort); | 466 LayoutTestHttpServer http_server(new_http_root_dir_, kHttpPort); |
467 ASSERT_TRUE(http_server.Start()); | 467 ASSERT_TRUE(http_server.Start()); |
468 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) | 468 for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i) |
469 RunLayoutTest(kLayoutTestFiles[i], kHttpPort); | 469 RunLayoutTest(kLayoutTestFiles[i], kHttpPort); |
470 ASSERT_TRUE(http_server.Stop()); | 470 ASSERT_TRUE(http_server.Stop()); |
471 } | 471 } |
472 | 472 |
473 // TODO(yutak): Reenable this test after the following issue is resolved. | 473 TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { |
474 // https://bugs.webkit.org/show_bug.cgi?id=64852 | |
475 TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) { | |
476 static const char* kLayoutTestFiles[] = { | 474 static const char* kLayoutTestFiles[] = { |
477 "close-in-onmessage-crash.html", | 475 "close-in-onmessage-crash.html", |
478 "close-in-shared-worker.html", | 476 "close-in-shared-worker.html", |
479 "close-in-worker.html", | 477 "close-in-worker.html", |
480 "shared-worker-simple.html", | 478 "shared-worker-simple.html", |
481 "worker-handshake-challenge-randomness.html", | 479 "worker-handshake-challenge-randomness.html", |
482 "worker-simple.html" | 480 "worker-simple.html" |
483 }; | 481 }; |
484 | 482 |
485 FilePath websocket_test_dir; | 483 FilePath websocket_test_dir; |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 } | 883 } |
886 | 884 |
887 #if defined(OS_LINUX) | 885 #if defined(OS_LINUX) |
888 // Fails on Linux due to an assert in WebKit's RNG. | 886 // Fails on Linux due to an assert in WebKit's RNG. |
889 // See http://webkit.org/b/55728. | 887 // See http://webkit.org/b/55728. |
890 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped | 888 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped |
891 #endif | 889 #endif |
892 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) { | 890 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) { |
893 RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html"); | 891 RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html"); |
894 } | 892 } |
OLD | NEW |