| Index: scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_commit_already_logged.json
|
| diff --git a/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_commit_already_logged.json b/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_commit_already_logged.json
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..0685352b62d9e35389d65a3b21223041b5c9228a
|
| --- /dev/null
|
| +++ b/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_commit_already_logged.json
|
| @@ -0,0 +1,412 @@
|
| +[
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| + "--master",
|
| + "chromium.testing.master",
|
| + "--builder",
|
| + "Android ChromeDriver Tests Example",
|
| + "--slave",
|
| + "slavename",
|
| + "--spec",
|
| + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| + "--root",
|
| + "src",
|
| + "--revision_mapping_file",
|
| + "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| + "--git-cache-dir",
|
| + "[GIT_CACHE]",
|
| + "--output_json",
|
| + "/path/to/tmp/json",
|
| + "--revision",
|
| + "src@HEAD",
|
| + "--force",
|
| + "--output_manifest"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + },
|
| + "name": "bot_update",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@Some step text@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/gsutil_download.py",
|
| + "--url",
|
| + "chromedriver-data/prebuilts",
|
| + "--dst",
|
| + "[TMP_BASE]/prebuilt_tmp_1/build.zip",
|
| + "--partial-name",
|
| + "chromedriver-data/prebuilts/r"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "download latest prebuilt"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::zip]/resources/unzip.py"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "unzip prebuilt",
|
| + "stdin": "{\"output\": \"[TMP_BASE]/prebuilt_tmp_1/unzipped\", \"zip_file\": \"[TMP_BASE]/prebuilt_tmp_1/build.zip\"}"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.move(sys.argv[1], sys.argv[2])\n",
|
| + "[TMP_BASE]/prebuilt_tmp_1/unzipped/chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "move prebuilt"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_py_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--reference-chromedriver",
|
| + "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
|
| + "--build-type",
|
| + "Release",
|
| + "--android-package",
|
| + "chrome_shell"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "python_tests(chrome_shell)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_java_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--build-type",
|
| + "Release",
|
| + "--verbose",
|
| + "--android-package",
|
| + "chrome_shell"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "java_tests(chrome_shell)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_py_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--reference-chromedriver",
|
| + "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
|
| + "--build-type",
|
| + "Release",
|
| + "--android-package",
|
| + "chrome_stable"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "python_tests(chrome_stable)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_java_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--build-type",
|
| + "Release",
|
| + "--verbose",
|
| + "--android-package",
|
| + "chrome_stable"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "java_tests(chrome_stable)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_py_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--reference-chromedriver",
|
| + "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
|
| + "--build-type",
|
| + "Release",
|
| + "--android-package",
|
| + "chrome_beta"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "python_tests(chrome_beta)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_java_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--build-type",
|
| + "Release",
|
| + "--verbose",
|
| + "--android-package",
|
| + "chrome_beta"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "java_tests(chrome_beta)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_py_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--reference-chromedriver",
|
| + "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
|
| + "--build-type",
|
| + "Release",
|
| + "--android-package",
|
| + "chromedriver_webview_shell"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "python_tests(chromedriver_webview_shell)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "xvfb-run",
|
| + "-a",
|
| + "run_java_tests.py",
|
| + "--chromedriver",
|
| + "[SLAVE_BUILD]/src/out/Release/chromedriver",
|
| + "--log-dir",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2",
|
| + "--build-type",
|
| + "Release",
|
| + "--verbose",
|
| + "--android-package",
|
| + "chromedriver_webview_shell"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
|
| + },
|
| + "name": "java_tests(chromedriver_webview_shell)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
|
| + "/path/to/tmp/",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2/*"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "glob search for server logs"
|
| + },
|
| + {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "upload chromedriver server logs"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_123",
|
| + "gs://chromedriver-data/server_logs/chromedriver_123"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "upload chromedriver server logs.gsutil uploading [TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_123",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "@@@STEP_LINK@server log [TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_123@https://storage.cloud.google.com/chromedriver-data/server_logs/chromedriver_123@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_456",
|
| + "gs://chromedriver-data/server_logs/chromedriver_456"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "upload chromedriver server logs.gsutil uploading [TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_456",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "@@@STEP_LINK@server log [TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_456@https://storage.cloud.google.com/chromedriver-data/server_logs/chromedriver_456@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "[TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_789",
|
| + "gs://chromedriver-data/server_logs/chromedriver_789"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "upload chromedriver server logs.gsutil uploading [TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_789",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "@@@STEP_LINK@server log [TMP_BASE]/chromedriver_logs_tmp_2/chromedriver_789@https://storage.cloud.google.com/chromedriver-data/server_logs/chromedriver_789@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "gs://chromedriver-data/android_log.json",
|
| + "[TMP_BASE]/results_log_tmp_3/android_log.json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "gsutil download results log"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[TMP_BASE]/results_log_tmp_3/android_log.json",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "read results log file"
|
| + },
|
| + {
|
| + "name": "$result",
|
| + "reason": "Results already exist for commit position 2222222222",
|
| + "status_code": 1
|
| + }
|
| +]
|
|
|