| 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 | 244 |
| 245 scoped_refptr<TabProxy> tab(GetActiveTab()); | 245 scoped_refptr<TabProxy> tab(GetActiveTab()); |
| 246 ASSERT_TRUE(tab.get()); | 246 ASSERT_TRUE(tab.get()); |
| 247 | 247 |
| 248 GURL url = test_server.GetURL("files/shared_worker_auth.html"); | 248 GURL url = test_server.GetURL("files/shared_worker_auth.html"); |
| 249 EXPECT_TRUE(NavigateAndWaitForAuth(tab, url)); | 249 EXPECT_TRUE(NavigateAndWaitForAuth(tab, url)); |
| 250 // TODO(atwilson): Add support to automation framework to test for auth | 250 // TODO(atwilson): Add support to automation framework to test for auth |
| 251 // dialogs displayed by non-navigating tabs. | 251 // dialogs displayed by non-navigating tabs. |
| 252 } | 252 } |
| 253 | 253 |
| 254 #if defined(OS_WIN) | |
| 255 // http://crbug.com/101996 | 254 // http://crbug.com/101996 |
| 256 #define StressJSExecution FLAKY_StressJSExecution | 255 TEST_F(WorkerTest, FLAKY_StressJSExecution) { |
| 257 #endif | |
| 258 TEST_F(WorkerTest, StressJSExecution) { | |
| 259 RunWorkerFastLayoutTest("stress-js-execution.html"); | 256 RunWorkerFastLayoutTest("stress-js-execution.html"); |
| 260 } | 257 } |
| 261 | 258 |
| 262 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 263 // http://crbug.com/101996 | 259 // http://crbug.com/101996 |
| 264 #define UseMachineStack FLAKY_UseMachineStack | 260 TEST_F(WorkerTest, FLAKY_UseMachineStack) { |
| 265 #endif | |
| 266 TEST_F(WorkerTest, UseMachineStack) { | |
| 267 RunWorkerFastLayoutTest("use-machine-stack.html"); | 261 RunWorkerFastLayoutTest("use-machine-stack.html"); |
| 268 } | 262 } |
| 269 | 263 |
| 270 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 271 // http://crbug.com/101996 | 264 // http://crbug.com/101996 |
| 272 #define WorkerCall FLAKY_WorkerCall | 265 TEST_F(WorkerTest, FLAKY_WorkerCall) { |
| 273 #endif | |
| 274 TEST_F(WorkerTest, WorkerCall) { | |
| 275 RunWorkerFastLayoutTest("worker-call.html"); | 266 RunWorkerFastLayoutTest("worker-call.html"); |
| 276 } | 267 } |
| 277 | 268 |
| 278 // Crashy, http://crbug.com/35965. | 269 // Crashy, http://crbug.com/35965. |
| 279 // Flaky, http://crbug.com/36555. | 270 // Flaky, http://crbug.com/36555. |
| 280 TEST_F(WorkerTest, DISABLED_WorkerClonePort) { | 271 TEST_F(WorkerTest, DISABLED_WorkerClonePort) { |
| 281 RunWorkerFastLayoutTest("worker-cloneport.html"); | 272 RunWorkerFastLayoutTest("worker-cloneport.html"); |
| 282 } | 273 } |
| 283 | 274 |
| 284 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) | |
| 285 // http://crbug.com/101996 | 275 // http://crbug.com/101996 |
| 286 #define WorkerCloseFast FLAKY_WorkerCloseFast | 276 TEST_F(WorkerTest, FLAKY_WorkerCloseFast) { |
| 287 #endif | |
| 288 TEST_F(WorkerTest, WorkerCloseFast) { | |
| 289 RunWorkerFastLayoutTest("worker-close.html"); | 277 RunWorkerFastLayoutTest("worker-close.html"); |
| 290 } | 278 } |
| 291 | 279 |
| 292 // Flaky (on XP), http://crbug.com/84203. | 280 // http://crbug.com/84203. |
| 293 TEST_F(WorkerTest, FLAKY_WorkerConstructor) { | 281 TEST_F(WorkerTest, FLAKY_WorkerConstructor) { |
| 294 RunWorkerFastLayoutTest("worker-constructor.html"); | 282 RunWorkerFastLayoutTest("worker-constructor.html"); |
| 295 } | 283 } |
| 296 | 284 |
| 297 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 298 // http://crbug.com/101996 | 285 // http://crbug.com/101996 |
| 299 #define WorkerContextGc FLAKY_WorkerContextGc | 286 TEST_F(WorkerTest, FLAKY_WorkerContextGc) { |
| 300 #endif | |
| 301 TEST_F(WorkerTest, WorkerContextGc) { | |
| 302 RunWorkerFastLayoutTest("worker-context-gc.html"); | 287 RunWorkerFastLayoutTest("worker-context-gc.html"); |
| 303 } | 288 } |
| 304 | 289 |
| 305 #if defined(OS_LINUX) | |
| 306 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 290 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 307 #define WorkerContextMultiPort FLAKY_WorkerContextMultiPort | 291 TEST_F(WorkerTest, FLAKY_WorkerContextMultiPort) { |
| 308 #endif | |
| 309 TEST_F(WorkerTest, WorkerContextMultiPort) { | |
| 310 RunWorkerFastLayoutTest("worker-context-multi-port.html"); | 292 RunWorkerFastLayoutTest("worker-context-multi-port.html"); |
| 311 } | 293 } |
| 312 | 294 |
| 313 #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) | |
| 314 // http://crbug.com/101996 | 295 // http://crbug.com/101996 |
| 315 #define WorkerEventListener FLAKY_WorkerEventListener | 296 TEST_F(WorkerTest, FLAKY_WorkerEventListener) { |
| 316 #endif | |
| 317 TEST_F(WorkerTest, WorkerEventListener) { | |
| 318 RunWorkerFastLayoutTest("worker-event-listener.html"); | 297 RunWorkerFastLayoutTest("worker-event-listener.html"); |
| 319 } | 298 } |
| 320 | 299 |
| 321 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 322 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 300 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 323 #define WorkerGC FLAKY_WorkerGC | 301 TEST_F(WorkerTest, FLAKY_WorkerGC) { |
| 324 #endif | |
| 325 TEST_F(WorkerTest, WorkerGC) { | |
| 326 RunWorkerFastLayoutTest("worker-gc.html"); | 302 RunWorkerFastLayoutTest("worker-gc.html"); |
| 327 } | 303 } |
| 328 | 304 |
| 329 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 330 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 305 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 331 #define WorkerInit FLAKY_WorkerInit | 306 TEST_F(WorkerTest, FLAKY_WorkerInit) { |
| 332 #endif | |
| 333 TEST_F(WorkerTest, WorkerInit) { | |
| 334 RunWorkerFastLayoutTest("worker-init.html"); | 307 RunWorkerFastLayoutTest("worker-init.html"); |
| 335 } | 308 } |
| 336 | 309 |
| 337 // worker-lifecycle.html relies on layoutTestController.workerThreadCount | 310 // worker-lifecycle.html relies on layoutTestController.workerThreadCount |
| 338 // which is not currently implemented. http://crbug.com/45168 | 311 // which is not currently implemented. http://crbug.com/45168 |
| 339 TEST_F(WorkerTest, DISABLED_WorkerLifecycle) { | 312 TEST_F(WorkerTest, DISABLED_WorkerLifecycle) { |
| 340 RunWorkerFastLayoutTest("worker-lifecycle.html"); | 313 RunWorkerFastLayoutTest("worker-lifecycle.html"); |
| 341 } | 314 } |
| 342 | 315 |
| 343 #if defined(OS_WIN) || defined(OS_LINUX) | 316 #if defined(OS_WIN) || defined(OS_LINUX) |
| 344 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 317 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 345 #define WorkerLocation FLAKY_WorkerLocation | 318 #define WorkerLocation FLAKY_WorkerLocation |
| 346 #endif | 319 #endif |
| 347 TEST_F(WorkerTest, WorkerLocation) { | 320 TEST_F(WorkerTest, WorkerLocation) { |
| 348 RunWorkerFastLayoutTest("worker-location.html"); | 321 RunWorkerFastLayoutTest("worker-location.html"); |
| 349 } | 322 } |
| 350 | 323 |
| 351 // Flaky, http://crbug.com/71518. | 324 // Flaky, http://crbug.com/71518. |
| 352 TEST_F(WorkerTest, FLAKY_WorkerMapGc) { | 325 TEST_F(WorkerTest, FLAKY_WorkerMapGc) { |
| 353 RunWorkerFastLayoutTest("wrapper-map-gc.html"); | 326 RunWorkerFastLayoutTest("wrapper-map-gc.html"); |
| 354 } | 327 } |
| 355 | 328 |
| 356 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 357 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 329 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 358 #define WorkerMessagePort FLAKY_WorkerMessagePort | 330 TEST_F(WorkerTest, FLAKY_WorkerMessagePort) { |
| 359 #endif | |
| 360 TEST_F(WorkerTest, WorkerMessagePort) { | |
| 361 RunWorkerFastLayoutTest("worker-messageport.html"); | 331 RunWorkerFastLayoutTest("worker-messageport.html"); |
| 362 } | 332 } |
| 363 | 333 |
| 364 #if defined(OS_WIN) || defined(OS_LINUX) | 334 #if defined(OS_WIN) || defined(OS_LINUX) |
| 365 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 335 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 366 #define WorkerMessagePortGC FLAKY_WorkerMessagePortGC | 336 #define WorkerMessagePortGC FLAKY_WorkerMessagePortGC |
| 367 #endif | 337 #endif |
| 368 TEST_F(WorkerTest, WorkerMessagePortGC) { | 338 TEST_F(WorkerTest, WorkerMessagePortGC) { |
| 369 RunWorkerFastLayoutTest("worker-messageport-gc.html"); | 339 RunWorkerFastLayoutTest("worker-messageport-gc.html"); |
| 370 } | 340 } |
| 371 | 341 |
| 372 TEST_F(WorkerTest, WorkerMultiPort) { | 342 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 343 TEST_F(WorkerTest, FLAKY_WorkerMultiPort) { |
| 373 RunWorkerFastLayoutTest("worker-multi-port.html"); | 344 RunWorkerFastLayoutTest("worker-multi-port.html"); |
| 374 } | 345 } |
| 375 | 346 |
| 376 // Flaky, http://crbug.com/76426. | 347 // Flaky, http://crbug.com/76426. |
| 377 TEST_F(WorkerTest, FLAKY_WorkerNavigator) { | 348 TEST_F(WorkerTest, FLAKY_WorkerNavigator) { |
| 378 RunWorkerFastLayoutTest("worker-navigator.html"); | 349 RunWorkerFastLayoutTest("worker-navigator.html"); |
| 379 } | 350 } |
| 380 | 351 |
| 381 #if defined(OS_WIN) || defined(OS_LINUX) | 352 #if defined(OS_WIN) || defined(OS_LINUX) |
| 382 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 353 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 383 #define WorkerReplaceGlobalConstructor FLAKY_WorkerReplaceGlobalConstructor | 354 #define WorkerReplaceGlobalConstructor FLAKY_WorkerReplaceGlobalConstructor |
| 384 #endif | 355 #endif |
| 385 TEST_F(WorkerTest, WorkerReplaceGlobalConstructor) { | 356 TEST_F(WorkerTest, WorkerReplaceGlobalConstructor) { |
| 386 RunWorkerFastLayoutTest("worker-replace-global-constructor.html"); | 357 RunWorkerFastLayoutTest("worker-replace-global-constructor.html"); |
| 387 } | 358 } |
| 388 | 359 |
| 389 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 390 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 360 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 391 #define WorkerReplaceSelf FLAKY_WorkerReplaceSelf | 361 TEST_F(WorkerTest, FLAKY_WorkerReplaceSelf) { |
| 392 #endif | |
| 393 TEST_F(WorkerTest, WorkerReplaceSelf) { | |
| 394 RunWorkerFastLayoutTest("worker-replace-self.html"); | 362 RunWorkerFastLayoutTest("worker-replace-self.html"); |
| 395 } | 363 } |
| 396 | 364 |
| 397 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) | |
| 398 // Mac: http://crbug.com/44457 | 365 // Mac: http://crbug.com/44457 |
| 399 // Windows: http://crbug.com/101996 | 366 // Others: http://crbug.com/101996 |
| 400 #define WorkerScriptError FLAKY_WorkerScriptError | 367 TEST_F(WorkerTest, FLAKY_WorkerScriptError) { |
| 401 #endif | |
| 402 TEST_F(WorkerTest, WorkerScriptError) { | |
| 403 RunWorkerFastLayoutTest("worker-script-error.html"); | 368 RunWorkerFastLayoutTest("worker-script-error.html"); |
| 404 } | 369 } |
| 405 | 370 |
| 406 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) | |
| 407 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 371 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 408 #define WorkerTerminate FLAKY_WorkerTerminate | 372 TEST_F(WorkerTest, FLAKY_WorkerTerminate) { |
| 409 #endif | |
| 410 TEST_F(WorkerTest, WorkerTerminate) { | |
| 411 RunWorkerFastLayoutTest("worker-terminate.html"); | 373 RunWorkerFastLayoutTest("worker-terminate.html"); |
| 412 } | 374 } |
| 413 | 375 |
| 414 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) | |
| 415 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 376 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 416 #define WorkerTimeout FLAKY_WorkerTimeout | 377 TEST_F(WorkerTest, FLAKY_WorkerTimeout) { |
| 417 #endif | |
| 418 TEST_F(WorkerTest, WorkerTimeout) { | |
| 419 RunWorkerFastLayoutTest("worker-timeout.html"); | 378 RunWorkerFastLayoutTest("worker-timeout.html"); |
| 420 } | 379 } |
| 421 | 380 |
| 422 // | 381 // |
| 423 // SharedWorkerFastLayoutTests | 382 // SharedWorkerFastLayoutTests |
| 424 // | 383 // |
| 425 // http://crbug.com/27636 - incorrect URL_MISMATCH exceptions sometimes get | 384 // http://crbug.com/27636 - incorrect URL_MISMATCH exceptions sometimes get |
| 426 // generated on the windows try bots. FLAKY on Win. | 385 // generated on the windows try bots. FLAKY on Win. |
| 427 // http://crbug.com/28445 - flakiness on mac | 386 // http://crbug.com/28445 - flakiness on mac |
| 428 TEST_F(WorkerTest, FLAKY_SharedWorkerFastConstructor) { | 387 TEST_F(WorkerTest, FLAKY_SharedWorkerFastConstructor) { |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), | 595 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), |
| 637 FilePath(kManyWorkersFile)); | 596 FilePath(kManyWorkersFile)); |
| 638 url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1)); | 597 url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1)); |
| 639 | 598 |
| 640 NavigateToURL(url); | 599 NavigateToURL(url); |
| 641 ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab)); | 600 ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab)); |
| 642 } | 601 } |
| 643 | 602 |
| 644 // Doesn't crash, but on all platforms, it sometimes fails. | 603 // Doesn't crash, but on all platforms, it sometimes fails. |
| 645 // Flaky on all platforms: http://crbug.com/28445 | 604 // Flaky on all platforms: http://crbug.com/28445 |
| 646 #if defined(OS_LINUX) | |
| 647 // Hangs on Linux: http://crbug.com/30332 | 605 // Hangs on Linux: http://crbug.com/30332 |
| 648 #define FLAKY_LimitTotal DISABLED_LimitTotal | |
| 649 #elif defined(OS_MACOSX) | |
| 650 // Possibly causing ui_tests to hang on Mac: http://crbug.com/88958 | 606 // Possibly causing ui_tests to hang on Mac: http://crbug.com/88958 |
| 651 #define FLAKY_LimitTotal DISABLED_LimitTotal | 607 // Times out consistently on all platforms. |
| 652 #endif | 608 TEST_F(WorkerTest, DISABLED_LimitTotal) { |
| 653 TEST_F(WorkerTest, FLAKY_LimitTotal) { | |
| 654 int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; | 609 int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; |
| 655 int total_workers = WorkerService::kMaxWorkersWhenSeparate; | 610 int total_workers = WorkerService::kMaxWorkersWhenSeparate; |
| 656 | 611 |
| 657 int tab_count = (total_workers / max_workers_per_tab) + 1; | 612 int tab_count = (total_workers / max_workers_per_tab) + 1; |
| 658 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), | 613 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), |
| 659 FilePath(kManyWorkersFile)); | 614 FilePath(kManyWorkersFile)); |
| 660 url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab)); | 615 url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab)); |
| 661 | 616 |
| 662 scoped_refptr<TabProxy> tab(GetActiveTab()); | 617 scoped_refptr<TabProxy> tab(GetActiveTab()); |
| 663 ASSERT_TRUE(tab.get()); | 618 ASSERT_TRUE(tab.get()); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 | 787 |
| 833 // Navigate to a blank page so that any workers are cleaned up. | 788 // Navigate to a blank page so that any workers are cleaned up. |
| 834 // This helps leaks trackers do a better job of reporting. | 789 // This helps leaks trackers do a better job of reporting. |
| 835 scoped_refptr<TabProxy> tab(GetActiveTab()); | 790 scoped_refptr<TabProxy> tab(GetActiveTab()); |
| 836 ASSERT_TRUE(tab.get()); | 791 ASSERT_TRUE(tab.get()); |
| 837 GURL about_url(chrome::kAboutBlankURL); | 792 GURL about_url(chrome::kAboutBlankURL); |
| 838 EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url)); | 793 EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url)); |
| 839 } | 794 } |
| 840 }; | 795 }; |
| 841 | 796 |
| 842 #if defined(OS_LINUX) | |
| 843 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 797 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 844 #define Temporary FLAKY_Temporary | 798 TEST_F(WorkerFileSystemTest, FLAKY_Temporary) { |
| 845 #endif | |
| 846 TEST_F(WorkerFileSystemTest, Temporary) { | |
| 847 RunWorkerFileSystemLayoutTest("simple-temporary.html"); | 799 RunWorkerFileSystemLayoutTest("simple-temporary.html"); |
| 848 } | 800 } |
| 849 | 801 |
| 850 #if defined(OS_LINUX) | |
| 851 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 802 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 852 #define Persistent FLAKY_Persistent | 803 TEST_F(WorkerFileSystemTest, FLAKY_Persistent) { |
| 853 #endif | |
| 854 TEST_F(WorkerFileSystemTest, Persistent) { | |
| 855 RunWorkerFileSystemLayoutTest("simple-persistent.html"); | 804 RunWorkerFileSystemLayoutTest("simple-persistent.html"); |
| 856 } | 805 } |
| 857 | 806 |
| 858 #if defined(OS_LINUX) | 807 #if defined(OS_LINUX) |
| 859 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 808 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 860 #define SyncTemporary FLAKY_SyncTemporary | 809 #define SyncTemporary FLAKY_SyncTemporary |
| 861 #endif | 810 #endif |
| 862 TEST_F(WorkerFileSystemTest, SyncTemporary) { | 811 TEST_F(WorkerFileSystemTest, SyncTemporary) { |
| 863 RunWorkerFileSystemLayoutTest("simple-temporary-sync.html"); | 812 RunWorkerFileSystemLayoutTest("simple-temporary-sync.html"); |
| 864 } | 813 } |
| 865 | 814 |
| 866 // TODO(dpranke): This started failing in the webkit roll 84046:84325. | 815 // TODO(dpranke): This started failing in the webkit roll 84046:84325. |
| 867 // The upstream expectation needs to be updated. | 816 // The upstream expectation needs to be updated. |
| 868 TEST_F(WorkerFileSystemTest, FAILS_SyncPersistent) { | 817 TEST_F(WorkerFileSystemTest, FAILS_SyncPersistent) { |
| 869 RunWorkerFileSystemLayoutTest("simple-persistent-sync.html"); | 818 RunWorkerFileSystemLayoutTest("simple-persistent-sync.html"); |
| 870 } | 819 } |
| 871 | 820 |
| 872 #if defined(OS_LINUX) | |
| 873 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 821 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 874 #define AsyncOperations FLAKY_AsyncOperations | 822 TEST_F(WorkerFileSystemTest, FLAKY_AsyncOperations) { |
| 875 #endif | |
| 876 TEST_F(WorkerFileSystemTest, AsyncOperations) { | |
| 877 RunWorkerFileSystemLayoutTest("async-operations.html"); | 823 RunWorkerFileSystemLayoutTest("async-operations.html"); |
| 878 } | 824 } |
| 879 | 825 |
| 880 #if defined(OS_LINUX) || defined(OS_MACOSX) | 826 #if defined(OS_LINUX) || defined(OS_MACOSX) |
| 881 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 827 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 882 #define SyncOperations FLAKY_SyncOperations | 828 #define SyncOperations FLAKY_SyncOperations |
| 883 #endif | 829 #endif |
| 884 TEST_F(WorkerFileSystemTest, SyncOperations) { | 830 TEST_F(WorkerFileSystemTest, SyncOperations) { |
| 885 RunWorkerFileSystemLayoutTest("sync-operations.html"); | 831 RunWorkerFileSystemLayoutTest("sync-operations.html"); |
| 886 } | 832 } |
| 887 | 833 |
| 888 #if defined(OS_LINUX) | |
| 889 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 834 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 890 #define FileEntryToURISync FLAKY_FileEntryToURISync | 835 TEST_F(WorkerFileSystemTest, FLAKY_FileEntryToURISync) { |
| 891 #endif | |
| 892 TEST_F(WorkerFileSystemTest, FileEntryToURISync) { | |
| 893 RunWorkerFileSystemLayoutTest("file-entry-to-uri-sync.html"); | 836 RunWorkerFileSystemLayoutTest("file-entry-to-uri-sync.html"); |
| 894 } | 837 } |
| 895 | 838 |
| 896 // http://crbug.com/77442 | 839 // http://crbug.com/77442 |
| 897 TEST_F(WorkerFileSystemTest, FLAKY_ResolveURLHttpTests) { | 840 TEST_F(WorkerFileSystemTest, FLAKY_ResolveURLHttpTests) { |
| 898 static const char* kLayoutTests[] = { | 841 static const char* kLayoutTests[] = { |
| 899 "resolve-url.html", | 842 "resolve-url.html", |
| 900 "resolve-url-sync.html" | 843 "resolve-url-sync.html" |
| 901 }; | 844 }; |
| 902 RunWorkerFileSystemLayoutHttpTests(kLayoutTests, arraysize(kLayoutTests)); | 845 RunWorkerFileSystemLayoutHttpTests(kLayoutTests, arraysize(kLayoutTests)); |
| 903 } | 846 } |
| 904 | 847 |
| 905 #if defined(OS_LINUX) | 848 #if defined(OS_LINUX) |
| 906 // Fails on Linux due to an assert in WebKit's RNG. | 849 // Fails on Linux due to an assert in WebKit's RNG. |
| 907 // See http://webkit.org/b/55728. | 850 // See http://webkit.org/b/55728. |
| 908 #define FileFromFileEntry DISABLED_FileFromFileEntry | 851 #define FileFromFileEntry DISABLED_FileFromFileEntry |
| 909 #endif | 852 #endif |
| 910 TEST_F(WorkerFileSystemTest, FileFromFileEntry) { | 853 TEST_F(WorkerFileSystemTest, FileFromFileEntry) { |
| 911 RunWorkerFileSystemLayoutTest("file-from-file-entry.html"); | 854 RunWorkerFileSystemLayoutTest("file-from-file-entry.html"); |
| 912 } | 855 } |
| 913 | 856 |
| 914 #if defined(OS_LINUX) | 857 #if defined(OS_LINUX) |
| 915 // Fails on Linux due to an assert in WebKit's RNG. | 858 // Fails on Linux due to an assert in WebKit's RNG. |
| 916 // See http://webkit.org/b/55728. | 859 // See http://webkit.org/b/55728. |
| 917 #define FileFromFileEntrySync DISABLED_FileFromFileEntrySync | 860 #define FileFromFileEntrySync DISABLED_FileFromFileEntrySync |
| 918 #elif defined(OS_MACOSX) | 861 #else |
| 919 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). | 862 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). |
| 920 #define FileFromFileEntrySync FLAKY_FileFromFileEntrySync | 863 #define FileFromFileEntrySync FLAKY_FileFromFileEntrySync |
| 921 #endif | 864 #endif |
| 922 TEST_F(WorkerFileSystemTest, FileFromFileEntrySync) { | 865 TEST_F(WorkerFileSystemTest, FileFromFileEntrySync) { |
| 923 RunWorkerFileSystemLayoutTest("file-from-file-entry-sync.html"); | 866 RunWorkerFileSystemLayoutTest("file-from-file-entry-sync.html"); |
| 924 } | 867 } |
| 925 | 868 |
| 926 #if defined(OS_LINUX) | 869 #if defined(OS_LINUX) |
| 927 // Fails on Linux due to an assert in WebKit's RNG. | 870 // Fails on Linux due to an assert in WebKit's RNG. |
| 928 // See http://webkit.org/b/55728. | 871 // See http://webkit.org/b/55728. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 942 } | 885 } |
| 943 | 886 |
| 944 #if defined(OS_LINUX) | 887 #if defined(OS_LINUX) |
| 945 // Fails on Linux due to an assert in WebKit's RNG. | 888 // Fails on Linux due to an assert in WebKit's RNG. |
| 946 // See http://webkit.org/b/55728. | 889 // See http://webkit.org/b/55728. |
| 947 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped | 890 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped |
| 948 #endif | 891 #endif |
| 949 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) { | 892 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) { |
| 950 RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html"); | 893 RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html"); |
| 951 } | 894 } |
| OLD | NEW |