Commit f666fb8e authored by Hans Wennborg's avatar Hans Wennborg Committed by Commit Bot

Android test exclusions: don't exclude libjingle_xmpp_unittests

These tests do pass on some bots, e.g. [1], and it's not clear why they were
being excluded. If there's a legitimate reason for them not to run on Android,
let's figure it out and get a bug filed.

Sheriffs: if this causes the tests to start failing on Android bots, please
file a bug with information about the error, put the exclusion back and
reference the bug.

(This also enables the test on two chromiumos bots. Presumably it passes
there too.)

Bug: 842698

 [1] https://ci.chromium.org/buildbot/chromium.clang/ToTAndroid/3343

R=kbr@chromium.org, thakis@chromium.org

Change-Id: I4f3febe1247d12a3a19f4f1455bc8c841af52628
Reviewed-on: https://chromium-review.googlesource.com/1063830
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559513}
parent 8fd42c9b
...@@ -743,6 +743,12 @@ ...@@ -743,6 +743,12 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "libjingle_xmpp_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -962,6 +968,12 @@ ...@@ -962,6 +968,12 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "libjingle_xmpp_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -1695,6 +1707,32 @@ ...@@ -1695,6 +1707,32 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3159,6 +3197,50 @@ ...@@ -3159,6 +3197,50 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -4003,6 +4085,12 @@ ...@@ -4003,6 +4085,12 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "libjingle_xmpp_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -4233,6 +4321,12 @@ ...@@ -4233,6 +4321,12 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "libjingle_xmpp_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -5991,6 +6085,30 @@ ...@@ -5991,6 +6085,30 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
...@@ -5116,6 +5116,49 @@ ...@@ -5116,6 +5116,49 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -6886,6 +6929,50 @@ ...@@ -6886,6 +6929,50 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "LMY48I",
"device_type": "hammerhead"
}
],
"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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -8613,6 +8700,50 @@ ...@@ -8613,6 +8700,50 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "LMY49B",
"device_type": "flo"
}
],
"expiration": 10800,
"hard_timeout": 120,
"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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -10362,6 +10493,49 @@ ...@@ -10362,6 +10493,49 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "MMB29Q",
"device_type": "bullhead"
}
],
"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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -12131,6 +12305,48 @@ ...@@ -12131,6 +12305,48 @@
}, },
"test": "latency_unittests" "test": "latency_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "MMB29Q",
"device_type": "bullhead"
}
],
"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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -13964,6 +14180,49 @@ ...@@ -13964,6 +14180,49 @@
}, },
"test": "jingle_unittests" "test": "jingle_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"libjingle_xmpp_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": "MRA58Z",
"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": "libjingle_xmpp_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
...@@ -1748,28 +1748,6 @@ ...@@ -1748,28 +1748,6 @@
}, },
}, },
}, },
'libjingle_xmpp_unittests': {
'remove_from': [
# On chromium.android, unclear why these aren't run on all bots.
'KitKat Tablet Tester',
'Lollipop Phone Tester',
'Lollipop Tablet Tester',
'Marshmallow 64 bit Tester',
'Marshmallow Phone Tester (rel)',
'Marshmallow 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',
'x86 Cloud Tester',
# chromium.chromiumos
'linux-chromeos-dbg',
'linux-chromeos-rel',
],
},
'mash_browser_tests': { 'mash_browser_tests': {
'remove_from': [ 'remove_from': [
# chromium.memory # chromium.memory
......
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