Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1069)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json

Issue 1588793002: Support variable substitution and tryserver- and waterfall-only cmd line args. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed review feedback. Revised tests. Rebased. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_trigger_failure.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
similarity index 93%
copy from scripts/slave/recipes/chromium_trybot.expected/swarming_trigger_failure.json
copy to scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
index 7af90b6cf3f60a3ca40185882397c26eb703d440..4e223bfabc79f5906fdf9b185848632f2fef3c6b 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarming_trigger_failure.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
@@ -162,12 +162,24 @@
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"isolated_scripts\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--correct-common-arg\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"isolate_name\": \"telemetry_gpu_unittests\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"telemetry_gpu_unittests\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"non_precommit_args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--SHOULD-NOT-BE-PRESENT-DURING-THE-RUN\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"precommit_args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--these-args-should-be-present\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--test-machine-name=\\\"${buildername}\\\"\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--build-revision=\\\"${got_revision}\\\"\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"base_unittests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -242,45 +254,41 @@
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ]@@@",
"@@@STEP_LOG_LINE@analyze_details@}@@@",
"@@@STEP_LOG_END@analyze_details@@@"
@@ -322,7 +330,7 @@
"--goma-dir",
"[BUILD]/goma",
"--swarming-targets-file",
- "angle_unittests\nbase_unittests\ncontent_gl_tests\ngl_tests\ngl_unittests\ntab_capture_end2end_tests\ntelemetry_gpu_test\n",
+ "angle_unittests\ncontent_gl_tests\ngl_tests\ngl_unittests\ntab_capture_end2end_tests\ntelemetry_gpu_test\ntelemetry_gpu_unittests\n",
"//out/Release"
],
"cwd": "[SLAVE_BUILD]",
@@ -350,14 +358,13 @@
"--ninja-ensure-up-to-date",
"--",
"angle_unittests_run",
- "base_unittests",
- "base_unittests_run",
"chromium_swarm_tests",
"content_gl_tests_run",
"gl_tests_run",
"gl_unittests_run",
"tab_capture_end2end_tests_run",
- "telemetry_gpu_test_run"
+ "telemetry_gpu_test_run",
+ "telemetry_gpu_unittests"
],
"cwd": "[SLAVE_BUILD]",
"name": "compile (with patch)",
@@ -391,10 +398,10 @@
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
+ "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/content_gl_tests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/gl_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/tab_capture_end2end_tests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/base_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/angle_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/telemetry_gpu_test.isolated.gen.json"
@@ -404,12 +411,12 @@
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"angle_unittests\": \"[dummy hash for angle_unittests]\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_unittests\": \"[dummy hash for base_unittests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"gl_tests\": \"[dummy hash for gl_tests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"gl_unittests\": \"[dummy hash for gl_unittests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests\": \"[dummy hash for telemetry_gpu_unittests]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -418,17 +425,89 @@
"cmd": [
"python",
"-u",
- "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
- "base_unittests"
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "30",
+ "--shards",
+ "1",
+ "--task-name",
+ "telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Ubuntu-12.04",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:linux_chromium_rel_ng",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:[dummy hash for telemetry_gpu_unittests]",
+ "--tag",
+ "master:tryserver.chromium.linux",
+ "--tag",
+ "name:telemetry_gpu_unittests (with patch)",
+ "--tag",
+ "os:Ubuntu-12.04",
+ "--tag",
+ "patch_project:chromium",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CQ",
+ "--tag",
+ "purpose:pre-commit",
+ "--tag",
+ "rietveld:https://codereview.chromium.org/12853011/#ps1",
+ "--tag",
+ "slavename:TestSlavename",
+ "--tag",
+ "stepname:telemetry_gpu_unittests (with patch)",
+ "--user",
+ "commit-bot@chromium.org",
+ "[dummy hash for telemetry_gpu_unittests]",
+ "--",
+ "--correct-common-arg",
+ "--these-args-should-be-present",
+ "--test-machine-name=\"linux_chromium_rel_ng\"",
+ "--build-revision=\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"",
+ "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "[error] base_unittests (with patch)",
+ "name": "[trigger] telemetry_gpu_unittests (with patch)",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
]
},
{
@@ -1816,17 +1895,26 @@
"cmd": [
"python",
"-u",
- "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
- "base_unittests"
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
+ "--task-output-dir",
+ "/path/to/tmp/"
],
"cwd": "[SLAVE_BUILD]",
- "name": "[collect error] base_unittests (with patch)",
+ "name": "telemetry_gpu_unittests (with patch)",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_LOG_LINE@outdir_json@{@@@",
+ "@@@STEP_LOG_LINE@outdir_json@ \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+ "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
+ "@@@STEP_LOG_LINE@outdir_json@}@@@",
+ "@@@STEP_LOG_END@outdir_json@@@"
]
},
{
@@ -2327,29 +2415,11 @@
"170242"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Upload to test-results [tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux]",
- "~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import sys; sys.exit(1)"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "base_unittests",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
- "@@@STEP_FAILURE@@@",
- "@@@SET_BUILD_PROPERTY@failure_hash@\"212d0eb2385b1eaa828053689225258ece065725\"@@@"
- ]
+ "name": "Upload to test-results [tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux]"
},
{
"name": "$result",
- "reason": "1 out of 1 aggregated steps failed. Failures: Step('base_unittests') failed with return_code 1",
- "status_code": 1
+ "recipe_result": null,
+ "status_code": 0
}
]
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698