Commit 32c26e8b authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Remove NavigationLoaderOnUI tests on mojo bots

This feature was removed in http://crrev.com/c/1732409, so we no longer
need these tests.

Bug: 824840
Change-Id: I582216aac6a27bf14b04ed6760b25aa65f698628
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1735949
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684071}
parent c5a8bb29
......@@ -887,27 +887,6 @@
},
"Mojo Linux": {
"gtest_tests": [
{
"args": [
"--enable-features=NavigationLoaderOnUI",
"--test-launcher-filter-file=../../testing/buildbot/filters/navigation_loader_on_ui_browser_tests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"shards": 15
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=NetworkService,NetworkServiceInProcess"
......@@ -948,46 +927,6 @@
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=NavigationLoaderOnUI"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
]
},
"test": "components_browsertests"
},
{
"args": [
"--enable-features=NavigationLoaderOnUI",
"--test-launcher-filter-file=../../testing/buildbot/filters/navigation_loader_on_ui_content_browsertests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"shards": 2
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=NetworkService,NetworkServiceInProcess"
......@@ -1007,73 +946,11 @@
"shards": 2
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=NavigationLoaderOnUI"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
]
},
"test": "extensions_browsertests"
}
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag=--enable-features=NavigationLoaderOnUI",
"--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/enable-features=NavigationLoaderOnUI",
"--num-retries=3"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"shards": 12
}
}
]
},
"Mojo Windows": {
"gtest_tests": [
{
"args": [
"--enable-features=NavigationLoaderOnUI",
"--test-launcher-filter-file=../../testing/buildbot/filters/navigation_loader_on_ui_browser_tests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 15
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=NetworkService,NetworkServiceInProcess"
......@@ -1104,36 +981,6 @@
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=NavigationLoaderOnUI"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{
"args": [
"--enable-features=NavigationLoaderOnUI",
"--test-launcher-filter-file=../../testing/buildbot/filters/navigation_loader_on_ui_content_browsertests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=NetworkService,NetworkServiceInProcess"
......@@ -1149,20 +996,6 @@
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=NavigationLoaderOnUI"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "navigation_ui_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{
"merge": {
"args": [],
......
......@@ -38,7 +38,6 @@ source_set("browser_tests_filters") {
data = [
"//testing/buildbot/filters/bfcache.browser_tests.filter",
"//testing/buildbot/filters/code_coverage.browser_tests.filter",
"//testing/buildbot/filters/navigation_loader_on_ui_browser_tests.filter",
"//testing/buildbot/filters/skia_renderer.browser_tests.filter",
"//testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"//testing/buildbot/filters/webui_html_imports_polyfill_browser_tests.filter",
......@@ -72,7 +71,6 @@ source_set("content_browsertests_filters") {
"//testing/buildbot/filters/bfcache.content_browsertests.filter",
"//testing/buildbot/filters/cast-linux.content_browsertests.filter",
"//testing/buildbot/filters/gpu.skiarenderer_vulkan_content_browsertests.filter",
"//testing/buildbot/filters/navigation_loader_on_ui_content_browsertests.filter",
"//testing/buildbot/filters/site_isolation_android.content_browsertests.filter",
"//testing/buildbot/filters/skia_renderer.content_browsertests.filter",
"//testing/buildbot/filters/vulkan.content_browsertests.filter",
......
# These tests currently fail when run with --enable-features=NavigationLoaderOnUI
# These tests currently fail when run with --enable-features=NavigationLoaderOnUI
......@@ -4171,65 +4171,6 @@
'monochrome_apk_checker': {},
},
'navigation_loader_on_ui_gtests': {
'navigation_ui_browser_tests': {
'args': [
'--enable-features=NavigationLoaderOnUI',
'--test-launcher-filter-file=../../testing/buildbot/filters/navigation_loader_on_ui_browser_tests.filter',
],
'swarming': {
'shards': 15,
},
'test': 'browser_tests',
},
'navigation_ui_components_browsertests': {
'args': [
'--enable-features=NavigationLoaderOnUI',
],
'test': 'components_browsertests',
},
'navigation_ui_content_browsertests': {
'args': [
'--enable-features=NavigationLoaderOnUI',
'--test-launcher-filter-file=../../testing/buildbot/filters/navigation_loader_on_ui_content_browsertests.filter',
],
'swarming': {
'shards': 2,
},
'test': 'content_browsertests',
},
'navigation_ui_extensions_browsertests': {
'args': [
'--enable-features=NavigationLoaderOnUI',
],
'test': 'extensions_browsertests',
},
},
'navigation_loader_on_ui_isolated_scripts': {
'webkit_layout_tests': {
'args': [
'--additional-driver-flag=--enable-features=NavigationLoaderOnUI',
'--additional-expectations=../../third_party/blink/web_tests/FlagExpectations/enable-features=NavigationLoaderOnUI',
# layout test failures are retried 3 times when '--test-list' is not
# passed, but 0 times when '--test-list' is passed. We want to always
# retry 3 times, so we explicitly specify it.
'--num-retries=3',
],
'isolate_name': 'blink_web_tests_exparchive',
'merge': {
'args': [
'--verbose',
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
'results_handler': 'layout tests',
'swarming': {
'shards': 12,
},
},
},
# These tests will be run on the main waterfall.
'network_service_android_gtests': {
'network_service_out_of_process_chrome_public_test_apk': {
......@@ -5570,14 +5511,12 @@
],
'mojo_linux_gtests': [
'navigation_loader_on_ui_gtests',
'network_service_fyi_gtests',
'network_service_in_process_gtests',
],
'mojo_windows_gtests': [
'mojo_windows_specific_gtests',
'navigation_loader_on_ui_gtests',
'network_service_fyi_gtests',
'network_service_in_process_gtests',
],
......
......@@ -1418,7 +1418,6 @@
],
'test_suites': {
'gtest_tests': 'mojo_linux_gtests',
'isolated_scripts': 'navigation_loader_on_ui_isolated_scripts',
},
},
'Mojo Windows': {
......
# These tests currently fail when run with --enable-features=NavigationLoaderOnUI
# See https://crbug.com/824840
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment