Commit 2953d9b0 authored by Hans Wennborg's avatar Hans Wennborg Committed by Commit Bot

testing: Don't exclude media_blink_unittests on Android

After https://chromium-review.googlesource.com/c/chromium/src/+/1059655
they should pass.

Bug: 842698
Change-Id: Ia986149f107ba7d8de203aa5cf6f69e560008655
Reviewed-on: https://chromium-review.googlesource.com/1059656Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558782}
parent 8195eec9
...@@ -719,6 +719,12 @@ ...@@ -719,6 +719,12 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_blink_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -908,6 +914,12 @@ ...@@ -908,6 +914,12 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_blink_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -1504,6 +1516,32 @@ ...@@ -1504,6 +1516,32 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "LMY47W",
"device_type": "sprout"
}
],
"expiration": 14400
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -2766,6 +2804,50 @@ ...@@ -2766,6 +2804,50 @@
}, },
"test": "ipc_tests" "test": "ipc_tests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "NRD91N",
"device_type": "bullhead"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3542,6 +3624,12 @@ ...@@ -3542,6 +3624,12 @@
}, },
"test": "ipc_tests" "test": "ipc_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_blink_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -3742,6 +3830,12 @@ ...@@ -3742,6 +3830,12 @@
}, },
"test": "ipc_tests" "test": "ipc_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_blink_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -4480,6 +4574,30 @@ ...@@ -4480,6 +4574,30 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho"
}
]
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -5373,6 +5491,30 @@ ...@@ -5373,6 +5491,30 @@
}, },
"test": "ipc_tests" "test": "ipc_tests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "gce_x86"
}
]
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
...@@ -1456,6 +1456,48 @@ ...@@ -1456,6 +1456,48 @@
}, },
"test": "libjingle_xmpp_unittests" "test": "libjingle_xmpp_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_type": "hammerhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3054,6 +3096,48 @@ ...@@ -3054,6 +3096,48 @@
}, },
"test": "libjingle_xmpp_unittests" "test": "libjingle_xmpp_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_type": "hammerhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -4608,6 +4692,49 @@ ...@@ -4608,6 +4692,49 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_blink_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84Z",
"device_type": "flo"
}
],
"expiration": 10800,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "media_blink_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
...@@ -5688,6 +5688,17 @@ ...@@ -5688,6 +5688,17 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho"
}
]
},
"test": "media_blink_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
......
...@@ -1988,25 +1988,6 @@ ...@@ -1988,25 +1988,6 @@
], ],
}, },
'media_blink_unittests': { 'media_blink_unittests': {
'remove_from': [
# On chromium.android, unclear why these aren't run on all bots.
'KitKat Phone Tester (dbg)',
'KitKat Phone Tester (rel)',
'KitKat Tablet Tester',
'Nougat Phone Tester',
# chromium.android.fyi
'Jelly Bean Tester',
'Lollipop Consumer Tester',
'Lollipop Low-end Tester',
'Unswarmed N5 Tests Dummy Builder',
'Unswarmed N5X Tests Dummy Builder',
'x64 Device Tester',
'x86 Cloud Tester',
# chromium.clang
'ToTAndroid x64',
# chromium.fyi
'Out of Process Profiling Android',
],
'modifications': { 'modifications': {
'Lollipop Tablet Tester': { 'Lollipop Tablet Tester': {
'swarming': { 'swarming': {
......
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