Commit 22c7b421 authored by Fabrice de Gans-Riberi's avatar Fabrice de Gans-Riberi Committed by Commit Bot

[Fuchsia] Disable integration tests on the waterfall.

Fuchsia integration tests have been flaking on the waterfall. Disable
them until the underlying issue is fixed.
This also separates castrunner unit tests and integration tests in two
different test suites.

Bug: 917192, 918586
Change-Id: Idd3ad424559b7d68679d16d6a2e56929c33e029a
Reviewed-on: https://chromium-review.googlesource.com/c/1393887Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619694}
parent 82020c5f
...@@ -3928,7 +3928,7 @@ ...@@ -3928,7 +3928,7 @@
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "castrunner_tests" "test": "castrunner_unittests"
}, },
{ {
"args": [ "args": [
...@@ -4032,12 +4032,6 @@ ...@@ -4032,12 +4032,6 @@
}, },
"test": "webrunner_browsertests" "test": "webrunner_browsertests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "webrunner_smoketests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -4071,7 +4065,7 @@ ...@@ -4071,7 +4065,7 @@
} }
] ]
}, },
"test": "castrunner_tests" "test": "castrunner_unittests"
}, },
{ {
"args": [ "args": [
...@@ -4250,17 +4244,6 @@ ...@@ -4250,17 +4244,6 @@
}, },
"test": "webrunner_browsertests" "test": "webrunner_browsertests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1"
}
]
},
"test": "webrunner_smoketests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
...@@ -4299,7 +4282,7 @@ ...@@ -4299,7 +4282,7 @@
} }
] ]
}, },
"test": "castrunner_tests" "test": "castrunner_unittests"
}, },
{ {
"args": [ "args": [
...@@ -4492,17 +4475,6 @@ ...@@ -4492,17 +4475,6 @@
}, },
"test": "webrunner_browsertests" "test": "webrunner_browsertests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1"
}
]
},
"test": "webrunner_smoketests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
......
...@@ -675,7 +675,7 @@ ...@@ -675,7 +675,7 @@
} }
] ]
}, },
"test": "castrunner_tests" "test": "castrunner_unittests"
}, },
{ {
"args": [ "args": [
...@@ -891,20 +891,6 @@ ...@@ -891,20 +891,6 @@
}, },
"test": "webrunner_browsertests" "test": "webrunner_browsertests"
}, },
{
"args": [
"--qemu-require-kvm"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1"
}
]
},
"test": "webrunner_smoketests"
},
{ {
"args": [ "args": [
"--qemu-require-kvm" "--qemu-require-kvm"
......
...@@ -411,8 +411,8 @@ ...@@ -411,8 +411,8 @@
"label": "//media/capture:capture_unittests", "label": "//media/capture:capture_unittests",
"type": "windowed_test_launcher", "type": "windowed_test_launcher",
}, },
"castrunner_tests": { "castrunner_unittests": {
"label": "//webrunner:castrunner_tests", "label": "//webrunner:castrunner_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"cast_audio_backend_unittests": { "cast_audio_backend_unittests": {
...@@ -2739,10 +2739,6 @@ ...@@ -2739,10 +2739,6 @@
"label": "//webrunner:webrunner_browsertests", "label": "//webrunner:webrunner_browsertests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"webrunner_smoketests": {
"label": "//webrunner:webrunner_smoketests",
"type": "console_test_launcher",
},
"webrunner_unittests": { "webrunner_unittests": {
"label": "//webrunner:webrunner_unittests", "label": "//webrunner:webrunner_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
...@@ -2715,7 +2715,7 @@ ...@@ -2715,7 +2715,7 @@
'fuchsia_gtests': { 'fuchsia_gtests': {
'base_unittests': {}, 'base_unittests': {},
'castrunner_tests': {}, 'castrunner_unittests': {},
'content_unittests': { 'content_unittests': {
'args': [ 'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter', '--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter',
...@@ -2752,7 +2752,6 @@ ...@@ -2752,7 +2752,6 @@
], ],
}, },
'webrunner_browsertests': {}, 'webrunner_browsertests': {},
'webrunner_smoketests': {},
'webrunner_unittests': {}, 'webrunner_unittests': {},
}, },
......
...@@ -117,22 +117,46 @@ executable("castrunner_exe") { ...@@ -117,22 +117,46 @@ executable("castrunner_exe") {
] ]
} }
test("castrunner_tests") { source_set("castrunner_test_support") {
sources = [ sources = [
"app/cast/cast_runner_integration_test.cc",
"app/cast/cast_runner_unittest.cc",
"app/cast/test_common.cc", "app/cast/test_common.cc",
"app/cast/test_common.h", "app/cast/test_common.h",
] ]
public_deps = [
"//base",
"//third_party/fuchsia-sdk/sdk:sys",
]
}
test("castrunner_unittests") {
sources = [
"app/cast/cast_runner_unittest.cc",
]
deps = [
":app_config_manager_test_support",
":castrunner_common",
":castrunner_test_support",
":test_common",
":test_support",
"//base/test:run_all_unittests",
"//base/test:test_support",
"//testing/gtest",
]
}
test("castrunner_integration_tests") {
sources = [
"app/cast/cast_runner_integration_test.cc",
]
deps = [ deps = [
":app_config_manager_test_support", ":app_config_manager_test_support",
":castrunner_common", ":castrunner_common",
":castrunner_test_support",
":test_common", ":test_common",
":test_support", ":test_support",
"//base/test:run_all_unittests", "//base/test:run_all_unittests",
"//base/test:test_support", "//base/test:test_support",
"//net:test_support", "//net:test_support",
"//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
package_deps = [ [ package_deps = [ [
......
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