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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json

Issue 2164043002: Clean up steps in Chromedriver recipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Fix expectation file error. Created 4 years, 5 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/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json
diff --git a/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json b/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json
index af40bc9f9045e715a30c42b327c062e61df15ee4..fac358783cbe71459b3c717199f2e2e5ef6ffeff 100644
--- a/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json
+++ b/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json
@@ -493,23 +493,19 @@
"cmd": [
"python",
"-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
+ "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/prebuilt_tmp_1"
],
- "name": "Download Prebuilts.rmtree remove temp dir",
+ "name": "Download Prebuilts.rmtree [TMP_BASE]/prebuilt_tmp_1",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "python_tests chrome_beta"
+ },
+ {
"cmd": [
"xvfb-run",
"-a",
@@ -517,7 +513,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_2/server_log",
+ "[TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -526,7 +522,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chrome_beta)"
+ "name": "python_tests chrome_beta.Run test python_tests chrome_beta",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -537,12 +536,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_2/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571",
+ "gs://chromedriver-data/server_logs/python_tests_chrome_beta_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_2/server_log",
+ "name": "python_tests chrome_beta.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_2/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_beta_571@@@"
]
},
{
@@ -552,7 +552,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_2"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_2"
+ "name": "python_tests chrome_beta.rmtree [TMP_BASE]/server_log_tmp_2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chrome_beta"
},
{
"cmd": [
@@ -562,7 +569,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_3/server_log",
+ "[TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571",
"--verbose",
"--android-package",
"chrome_beta"
@@ -570,7 +577,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chrome_beta)"
+ "name": "java_tests chrome_beta.Run test java_tests chrome_beta",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -581,12 +591,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_3/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571",
+ "gs://chromedriver-data/server_logs/java_tests_chrome_beta_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_3/server_log",
+ "name": "java_tests chrome_beta.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_3/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chrome_beta_571@@@"
]
},
{
@@ -596,7 +607,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_3"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_3"
+ "name": "java_tests chrome_beta.rmtree [TMP_BASE]/server_log_tmp_3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "python_tests chrome_stable"
},
{
"cmd": [
@@ -606,7 +624,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_4/server_log",
+ "[TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -615,7 +633,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chrome_stable)"
+ "name": "python_tests chrome_stable.Run test python_tests chrome_stable",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -626,12 +647,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_4/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
+ "gs://chromedriver-data/server_logs/python_tests_chrome_stable_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_4/server_log",
+ "name": "python_tests chrome_stable.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_4/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_stable_571@@@"
]
},
{
@@ -641,38 +663,22 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_4"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_4"
+ "name": "python_tests chrome_stable.rmtree [TMP_BASE]/server_log_tmp_4",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
- "cmd": [
- "xvfb-run",
- "-a",
- "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
- "--chromedriver",
- "[SLAVE_BUILD]/src/out/Debug/chromedriver",
- "--log-path",
- "[TMP_BASE]/server_log_tmp_5/server_log",
- "--verbose",
- "--android-package",
- "chrome_stable"
- ],
- "env": {
- "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
- },
- "name": "java_tests(chrome_stable)",
+ "cmd": [],
+ "name": "java_tests chrome_stable",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
- "[TMP_BASE]/server_log_tmp_5"
- ],
- "name": "rmtree [TMP_BASE]/server_log_tmp_5"
+ "cmd": [],
+ "name": "python_tests chromedriver_webview_shell"
},
{
"cmd": [
@@ -682,7 +688,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_6/server_log",
+ "[TMP_BASE]/server_log_tmp_5/python_tests_chromedriver_webview_shell_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -691,7 +697,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chromedriver_webview_shell)"
+ "name": "python_tests chromedriver_webview_shell.Run test python_tests chromedriver_webview_shell",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -702,12 +711,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_6/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_5/python_tests_chromedriver_webview_shell_571",
+ "gs://chromedriver-data/server_logs/python_tests_chromedriver_webview_shell_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_6/server_log",
+ "name": "python_tests chromedriver_webview_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_5/python_tests_chromedriver_webview_shell_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_6/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_5/python_tests_chromedriver_webview_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chromedriver_webview_shell_571@@@"
]
},
{
@@ -715,9 +725,16 @@
"python",
"-u",
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
- "[TMP_BASE]/server_log_tmp_6"
+ "[TMP_BASE]/server_log_tmp_5"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_6"
+ "name": "python_tests chromedriver_webview_shell.rmtree [TMP_BASE]/server_log_tmp_5",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chromedriver_webview_shell"
},
{
"cmd": [
@@ -727,7 +744,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_7/server_log",
+ "[TMP_BASE]/server_log_tmp_6/java_tests_chromedriver_webview_shell_571",
"--verbose",
"--android-package",
"chromedriver_webview_shell"
@@ -735,7 +752,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chromedriver_webview_shell)"
+ "name": "java_tests chromedriver_webview_shell.Run test java_tests chromedriver_webview_shell",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -746,12 +766,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_7/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_6/java_tests_chromedriver_webview_shell_571",
+ "gs://chromedriver-data/server_logs/java_tests_chromedriver_webview_shell_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/server_log",
+ "name": "java_tests chromedriver_webview_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_6/java_tests_chromedriver_webview_shell_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_6/java_tests_chromedriver_webview_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chromedriver_webview_shell_571@@@"
]
},
{
@@ -759,9 +780,16 @@
"python",
"-u",
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
- "[TMP_BASE]/server_log_tmp_7"
+ "[TMP_BASE]/server_log_tmp_6"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_7"
+ "name": "java_tests chromedriver_webview_shell.rmtree [TMP_BASE]/server_log_tmp_6",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "python_tests chromium"
},
{
"cmd": [
@@ -771,7 +799,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_8/server_log",
+ "[TMP_BASE]/server_log_tmp_7/python_tests_chromium_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -780,7 +808,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chromium)"
+ "name": "python_tests chromium.Run test python_tests chromium",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -791,12 +822,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_8/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_7/python_tests_chromium_571",
+ "gs://chromedriver-data/server_logs/python_tests_chromium_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_8/server_log",
+ "name": "python_tests chromium.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/python_tests_chromium_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_8/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/python_tests_chromium_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chromium_571@@@"
]
},
{
@@ -804,9 +836,16 @@
"python",
"-u",
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
- "[TMP_BASE]/server_log_tmp_8"
+ "[TMP_BASE]/server_log_tmp_7"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_8"
+ "name": "python_tests chromium.rmtree [TMP_BASE]/server_log_tmp_7",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chromium"
},
{
"cmd": [
@@ -816,7 +855,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Debug/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_9/server_log",
+ "[TMP_BASE]/server_log_tmp_8/java_tests_chromium_571",
"--verbose",
"--android-package",
"chromium"
@@ -824,7 +863,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chromium)"
+ "name": "java_tests chromium.Run test java_tests chromium",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -835,12 +877,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_9/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_8/java_tests_chromium_571",
+ "gs://chromedriver-data/server_logs/java_tests_chromium_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_9/server_log",
+ "name": "java_tests chromium.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_8/java_tests_chromium_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_9/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_8/java_tests_chromium_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chromium_571@@@"
]
},
{
@@ -848,9 +891,12 @@
"python",
"-u",
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
- "[TMP_BASE]/server_log_tmp_9"
+ "[TMP_BASE]/server_log_tmp_8"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_9"
+ "name": "java_tests chromium.rmtree [TMP_BASE]/server_log_tmp_8",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [],
@@ -866,7 +912,7 @@
"----",
"cp",
"gs://chromedriver-data/android_log.json",
- "[TMP_BASE]/results_log_tmp_10/android_log.json"
+ "[TMP_BASE]/results_log_tmp_9/android_log.json"
],
"name": "Download Test Results Log.gsutil download results log",
"~followup_annotations": [
@@ -878,7 +924,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/results_log_tmp_10/android_log.json",
+ "[TMP_BASE]/results_log_tmp_9/android_log.json",
"/path/to/tmp/"
],
"name": "Download Test Results Log.read results log file",
@@ -890,20 +936,12 @@
"cmd": [
"python",
"-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[TMP_BASE]/results_log_tmp_10"
+ "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
+ "[TMP_BASE]/results_log_tmp_9"
],
- "name": "Download Test Results Log.rmtree remove temp dir",
+ "name": "Download Test Results Log.rmtree [TMP_BASE]/results_log_tmp_9",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -916,7 +954,7 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"170242\": false}",
- "[TMP_BASE]/results_log_tmp_11/android_log.json"
+ "[TMP_BASE]/results_log_tmp_10/android_log.json"
],
"name": "Upload Test Results Log.write results log to file android_log.json",
"~followup_annotations": [
@@ -932,7 +970,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/results_log_tmp_11/android_log.json",
+ "[TMP_BASE]/results_log_tmp_10/android_log.json",
"gs://chromedriver-data/android_log.json"
],
"name": "Upload Test Results Log.gsutil upload results log android_log.json",
@@ -945,20 +983,12 @@
"cmd": [
"python",
"-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[TMP_BASE]/results_log_tmp_11"
+ "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
+ "[TMP_BASE]/results_log_tmp_10"
],
- "name": "Upload Test Results Log.rmtree remove temp dir",
+ "name": "Upload Test Results Log.rmtree [TMP_BASE]/results_log_tmp_10",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
« no previous file with comments | « scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698