From 61b67fa50ef3b2e31b8a69e257d92f908e6bff03 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Wed, 22 Jul 2015 14:39:00 +0200 Subject: [PATCH] Backed out changeset df2c4d643820 (bug 1185453) for mulet mochitest bustage on a CLOSED TREE --- .../mozharness/android_arm_4_3_config.py | 94 ++++--------- .../config/mozharness/android_arm_config.py | 127 +++++------------- .../config/mozharness/android_panda_config.py | 4 +- .../config/mozharness/android_x86_config.py | 62 +++------ .../config/mozharness/b2g_desktop_config.py | 1 - .../config/mozharness/b2g_emulator_config.py | 5 +- testing/config/mozharness/linux_config.py | 4 - testing/config/mozharness/mac_config.py | 2 - testing/config/mozharness/marionette.py | 7 +- .../mozharness/taskcluster_linux_config.py | 29 ++-- testing/config/mozharness/windows_config.py | 2 - .../scripts/android_emulator_unittest.py | 4 - testing/mozharness/scripts/android_panda.py | 3 - .../scripts/androidx86_emulator_unittest.py | 3 - .../scripts/b2g_desktop_unittest.py | 3 - .../scripts/b2g_emulator_unittest.py | 3 - .../mozharness/scripts/desktop_unittest.py | 4 - .../mozharness/scripts/luciddream_unittest.py | 1 - testing/mozharness/scripts/marionette.py | 3 - 19 files changed, 96 insertions(+), 265 deletions(-) diff --git a/testing/config/mozharness/android_arm_4_3_config.py b/testing/config/mozharness/android_arm_4_3_config.py index ba34d3b28d13..a2d20c657ab4 100644 --- a/testing/config/mozharness/android_arm_4_3_config.py +++ b/testing/config/mozharness/android_arm_4_3_config.py @@ -7,39 +7,21 @@ config = { "mochitest": { "run_filename": "runtestsremote.py", "testsdir": "mochitest", - "options": [ - "--dm_trans=adb", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - "--screenshot-on-fail", + "options": ["--dm_trans=adb", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail", ], }, "mochitest-gl": { "run_filename": "runtestsremote.py", "testsdir": "mochitest", - "options": [ - "--dm_trans=adb", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - "--screenshot-on-fail", + "options": ["--dm_trans=adb", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail", "--total-chunks=4", "--subsuite=webgl", ], @@ -47,19 +29,11 @@ config = { "robocop": { "run_filename": "runrobocop.py", "testsdir": "mochitest", - "options": [ - "--dm_trans=adb", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", + "options": ["--dm_trans=adb", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--total-chunks=4", "--robocop-apk=../../robocop.apk", "--robocop-ini=robocop.ini", @@ -68,17 +42,12 @@ config = { "reftest": { "run_filename": "remotereftest.py", "testsdir": "reftest", - "options": [ - "--app=%(app)s", - "--ignore-window-size", + "options": [ "--app=%(app)s", "--ignore-window-size", "--dm_trans=adb", "--bootstrap", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--httpd-path", "%(modules_dir)s", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s", "--symbols-path=%(symbols_path)s", "--total-chunks=16", "tests/layout/reftests/reftest.list", @@ -87,18 +56,12 @@ config = { "crashtest": { "run_filename": "remotereftest.py", "testsdir": "reftest", - "options": [ - "--app=%(app)s", - "--ignore-window-size", + "options": [ "--app=%(app)s", "--ignore-window-size", "--dm_trans=adb", "--bootstrap", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--httpd-path", - "%(modules_dir)s", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s", "--symbols-path=%(symbols_path)s", "--total-chunks=2", "tests/testing/crashtest/crashtests.list", @@ -107,9 +70,7 @@ config = { "jsreftest": { "run_filename": "remotereftest.py", "testsdir": "reftest", - "options": [ - "--app=%(app)s", - "--ignore-window-size", + "options": [ "--app=%(app)s", "--ignore-window-size", "--dm_trans=adb", "--bootstrap", "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", @@ -126,14 +87,11 @@ config = { "testsdir": "xpcshell", "options": [ "--dm_trans=adb", - "--xre-path=%(xre_path)s", - "--testing-modules-dir=%(modules_dir)s", - "--apk=%(installer_path)s", - "--no-logfiles", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", "--symbols-path=%(symbols_path)s", "--manifest=tests/xpcshell.ini", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--total-chunks=3", ], }, diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py index 46dadef7ca9c..a86b4ab2f21f 100644 --- a/testing/config/mozharness/android_arm_config.py +++ b/testing/config/mozharness/android_arm_config.py @@ -7,43 +7,23 @@ config = { "mochitest": { "run_filename": "runtestsremote.py", "testsdir": "mochitest", - "options": [ - "--dm_trans=sut", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - "--screenshot-on-fail", + "options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail", ], }, "mochitest-gl": { "run_filename": "runtestsremote.py", "testsdir": "mochitest", - "options": [ - "--dm_trans=sut", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - "--screenshot-on-fail", + "options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail", "--total-chunks=4", "--subsuite=webgl", ], @@ -51,21 +31,12 @@ config = { "robocop": { "run_filename": "runrobocop.py", "testsdir": "mochitest", - "options": [ - "--dm_trans=sut", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", + "options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--total-chunks=4", "--robocop-apk=../../robocop.apk", "--robocop-ini=robocop.ini", @@ -74,19 +45,12 @@ config = { "reftest": { "run_filename": "remotereftest.py", "testsdir": "reftest", - "options": [ - "--app=%(app)s", - "--ignore-window-size", + "options": [ "--app=%(app)s", "--ignore-window-size", "--bootstrap", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--httpd-path", - "%(modules_dir)s", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s", "--symbols-path=%(symbols_path)s", "--total-chunks=16", "tests/layout/reftests/reftest.list", @@ -95,19 +59,12 @@ config = { "crashtest": { "run_filename": "remotereftest.py", "testsdir": "reftest", - "options": [ - "--app=%(app)s", - "--ignore-window-size", + "options": [ "--app=%(app)s", "--ignore-window-size", "--bootstrap", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--httpd-path", - "%(modules_dir)s", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s", "--symbols-path=%(symbols_path)s", "--total-chunks=2", "tests/testing/crashtest/crashtests.list", @@ -116,19 +73,12 @@ config = { "jsreftest": { "run_filename": "remotereftest.py", "testsdir": "reftest", - "options": [ - "--app=%(app)s", - "--ignore-window-size", + "options": [ "--app=%(app)s", "--ignore-window-size", "--bootstrap", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--httpd-path", - "%(modules_dir)s", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s", "--symbols-path=%(symbols_path)s", "../jsreftest/tests/jstests.list", "--total-chunks=6", @@ -138,17 +88,12 @@ config = { "xpcshell": { "run_filename": "remotexpcshelltests.py", "testsdir": "xpcshell", - "options": [ - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--xre-path=%(xre_path)s", - "--testing-modules-dir=%(modules_dir)s", - "--apk=%(installer_path)s", - "--no-logfiles", + "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", "--symbols-path=%(symbols_path)s", "--manifest=tests/xpcshell.ini", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--total-chunks=3", ], }, diff --git a/testing/config/mozharness/android_panda_config.py b/testing/config/mozharness/android_panda_config.py index 32afd6bf9051..f86fdc36f3ba 100644 --- a/testing/config/mozharness/android_panda_config.py +++ b/testing/config/mozharness/android_panda_config.py @@ -80,7 +80,6 @@ config = { "--symbols-path=%(symbols_path)s", "--quiet", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--screenshot-on-fail", ], "run_filename": "runtestsremote.py", @@ -130,8 +129,7 @@ config = { "--apk=../%(apk_name)s", "--no-logfiles", "--symbols-path=%(symbols_path)s", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", + "--log-raw=%(raw_log_file)s" ], "run_filename": "remotexpcshelltests.py", "testsdir": "xpcshell" diff --git a/testing/config/mozharness/android_x86_config.py b/testing/config/mozharness/android_x86_config.py index 7ef1caccbc72..1a4c64012948 100644 --- a/testing/config/mozharness/android_x86_config.py +++ b/testing/config/mozharness/android_x86_config.py @@ -6,52 +6,34 @@ config = { "suite_definitions": { "mochitest": { "run_filename": "runtestsremote.py", - "options": ["--dm_trans=sut", - "--app=%(app)s", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--certificate-path=%(certs_path)s", - "--symbols-path=%(symbols_path)s", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - "--screenshot-on-fail", - ], + "options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s", + "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail", + ], }, "reftest": { "run_filename": "remotereftest.py", - "options": ["--app=%(app)s", - "--ignore-window-size", - "--bootstrap", - "--remote-webserver=%(remote_webserver)s", - "--xre-path=%(xre_path)s", - "--utility-path=%(utility_path)s", - "--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--http-port=%(http_port)s", - "--ssl-port=%(ssl_port)s", - "--httpd-path", "%(modules_dir)s", - "--symbols-path=%(symbols_path)s", - ], + "options": [ "--app=%(app)s", "--ignore-window-size", + "--bootstrap", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s", + "--symbols-path=%(symbols_path)s", + ], }, "xpcshell": { "run_filename": "remotexpcshelltests.py", - "options": ["--deviceIP=%(device_ip)s", - "--devicePort=%(device_port)s", - "--xre-path=%(xre_path)s", - "--testing-modules-dir=%(modules_dir)s", - "--apk=%(installer_path)s", - "--no-logfiles", - "--symbols-path=%(symbols_path)s", - "--manifest=tests/xpcshell.ini", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - ], + "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", + "--symbols-path=%(symbols_path)s", + "--manifest=tests/xpcshell.ini", + "--log-raw=%(raw_log_file)s", + ], }, }, # end suite_definitions } diff --git a/testing/config/mozharness/b2g_desktop_config.py b/testing/config/mozharness/b2g_desktop_config.py index 3b5545593d3f..755095f0854e 100644 --- a/testing/config/mozharness/b2g_desktop_config.py +++ b/testing/config/mozharness/b2g_desktop_config.py @@ -17,7 +17,6 @@ config = { "--browser-arg=%(browser_arg)s", "--quiet", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--screenshot-on-fail", ], "run_filename": "runtestsb2g.py", diff --git a/testing/config/mozharness/b2g_emulator_config.py b/testing/config/mozharness/b2g_emulator_config.py index a3ec67493d4b..41af93c17f09 100644 --- a/testing/config/mozharness/b2g_emulator_config.py +++ b/testing/config/mozharness/b2g_emulator_config.py @@ -71,7 +71,6 @@ config = { "--this-chunk=%(this_chunk)s", "--quiet", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--certificate-path=%(certificate_path)s", "--screenshot-on-fail", "%(test_path)s" @@ -94,7 +93,6 @@ config = { "--quiet", "--chrome", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--certificate-path=%(certificate_path)s", "--screenshot-on-fail", "%(test_path)s" @@ -135,8 +133,7 @@ config = { "--busybox=%(busybox)s", "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", + "--log-raw=%(raw_log_file)s" ], "run_filename": "runtestsb2g.py", "testsdir": "xpcshell" diff --git a/testing/config/mozharness/linux_config.py b/testing/config/mozharness/linux_config.py index 6ae9180be913..702eb9b5e221 100644 --- a/testing/config/mozharness/linux_config.py +++ b/testing/config/mozharness/linux_config.py @@ -27,7 +27,6 @@ config = { "options": [ "--startup-timeout=300", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--browser-path=%(browser_path)s", "--b2gpath=%(emulator_path)s", "%(test_manifest)s" @@ -37,7 +36,6 @@ config = { "options": [ "--startup-timeout=300", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--browser-path=%(browser_path)s", "--b2g-desktop-path=%(fxos_desktop_path)s", "--gaia-profile=%(gaia_profile)s", @@ -54,7 +52,6 @@ config = { "--setpref=webgl.force-enabled=true", "--quiet", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--use-test-media-devices", "--screenshot-on-fail", ], @@ -106,7 +103,6 @@ config = { "--symbols-path=%(symbols_path)s", "--test-plugin-path=%(test_plugin_path)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--utility-path=tests/bin", ], "run_filename": "runxpcshelltests.py", diff --git a/testing/config/mozharness/mac_config.py b/testing/config/mozharness/mac_config.py index 9783bcb0084e..8e938fbb5d5f 100644 --- a/testing/config/mozharness/mac_config.py +++ b/testing/config/mozharness/mac_config.py @@ -32,7 +32,6 @@ config = { "--certificate-path=tests/certs", "--quiet", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--screenshot-on-fail", ], "run_filename": "runtests.py", @@ -84,7 +83,6 @@ config = { "--symbols-path=%(symbols_path)s", "--test-plugin-path=%(test_plugin_path)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--utility-path=tests/bin", ], "run_filename": "runxpcshelltests.py", diff --git a/testing/config/mozharness/marionette.py b/testing/config/mozharness/marionette.py index 90d6eb56be73..f662171cf250 100644 --- a/testing/config/mozharness/marionette.py +++ b/testing/config/mozharness/marionette.py @@ -16,7 +16,6 @@ config = { "--xml-output=%(xml_output)s", "--html-output=%(html_output)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--binary=%(binary)s", "--address=%(address)s", "--total-chunks=%(total_chunks)s", @@ -36,7 +35,6 @@ config = { "--xml-output=%(xml_output)s", "--html-output=%(html_output)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", "--homedir=%(homedir)s" @@ -48,7 +46,6 @@ config = { "options": [ "--type=%(type)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--binary=%(binary)s", "--address=%(address)s", "--symbols-path=%(symbols_path)s" @@ -60,7 +57,6 @@ config = { "options": [ "--type=%(type)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", "--homedir=%(homedir)s", @@ -78,7 +74,6 @@ config = { "options": [ "--type=%(type)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--symbols-path=%(symbols_path)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", @@ -88,4 +83,4 @@ config = { "testsdir": "" } } -} +} \ No newline at end of file diff --git a/testing/config/mozharness/taskcluster_linux_config.py b/testing/config/mozharness/taskcluster_linux_config.py index bb15eb02d681..e55f525361a2 100644 --- a/testing/config/mozharness/taskcluster_linux_config.py +++ b/testing/config/mozharness/taskcluster_linux_config.py @@ -4,31 +4,20 @@ config = { "reftest_options": [ - "--appname=%(binary_path)s", - "--utility-path=tests/bin", - "--extra-profile-file=tests/bin/plugins", - "--symbols-path=%(symbols_path)s" + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" ], "mochitest_options": [ - "--appname=%(binary_path)s", - "--utility-path=tests/bin", - "--extra-profile-file=tests/bin/plugins", - "--symbols-path=%(symbols_path)s", - "--certificate-path=tests/certs", - "--setpref=webgl.force-enabled=true", - "--quiet", - "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", - "--screenshot-on-fail", + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--setpref=webgl.force-enabled=true", + "--quiet", "--log-raw=%(raw_log_file)s", "--screenshot-on-fail", ], "webapprt_options": [ - "--app=%(app_path)s", - "--utility-path=tests/bin", - "--extra-profile-file=tests/bin/plugins", - "--symbols-path=%(symbols_path)s", + "--app=%(app_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", "--certificate-path=tests/certs", - "--console-level=INFO", - "--testing-modules-dir=tests/modules", + "--console-level=INFO", "--testing-modules-dir=tests/modules", "--quiet" ], "xpcshell_options": [ diff --git a/testing/config/mozharness/windows_config.py b/testing/config/mozharness/windows_config.py index 18ee58258ba0..5b7219b19f37 100644 --- a/testing/config/mozharness/windows_config.py +++ b/testing/config/mozharness/windows_config.py @@ -32,7 +32,6 @@ config = { "--certificate-path=tests/certs", "--quiet", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--screenshot-on-fail", ], "run_filename": "runtests.py", @@ -83,7 +82,6 @@ config = { "--symbols-path=%(symbols_path)s", "--test-plugin-path=%(test_plugin_path)s", "--log-raw=%(raw_log_file)s", - "--log-errorsummary=%(error_summary_file)s", "--utility-path=tests/bin", ], "run_filename": "runxpcshelltests.py", diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py index bae5d101bc9f..e908163da8ab 100644 --- a/testing/mozharness/scripts/android_emulator_unittest.py +++ b/testing/mozharness/scripts/android_emulator_unittest.py @@ -453,9 +453,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], '%s_raw.log' % self.test_suite) - - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - '%s_errorsummary.log' % self.test_suite) str_format_values = { 'app': self._query_package_name(), 'remote_webserver': c['remote_webserver'], @@ -470,7 +467,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin 'modules_dir': dirs['abs_modules_dir'], 'installer_path': self.installer_path, 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, 'dm_trans': c['device_manager'], } if self.config["device_manager"] == "sut": diff --git a/testing/mozharness/scripts/android_panda.py b/testing/mozharness/scripts/android_panda.py index 8a3f0d58cfda..6cee2ee3cb8c 100644 --- a/testing/mozharness/scripts/android_panda.py +++ b/testing/mozharness/scripts/android_panda.py @@ -458,8 +458,6 @@ class PandaTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixin, Bu raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], '%s_raw.log' % suite) - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - '%s_errorsummary.log' % suite) str_format_values = { 'device_ip': self.device_ip, 'hostname': self.mozpool_device, @@ -470,7 +468,6 @@ class PandaTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixin, Bu 'apk_name': self.filename_apk, 'apk_path': self.apk_path, 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, } if '%s_options' % suite_category in self.tree_config: for option in self.tree_config['%s_options' % suite_category]: diff --git a/testing/mozharness/scripts/androidx86_emulator_unittest.py b/testing/mozharness/scripts/androidx86_emulator_unittest.py index 2c61e34eff22..541b7325c308 100644 --- a/testing/mozharness/scripts/androidx86_emulator_unittest.py +++ b/testing/mozharness/scripts/androidx86_emulator_unittest.py @@ -419,8 +419,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], '%s_raw.log' % suite_name) - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - '%s_errorsummary.log' % suite_name) str_format_values = { 'app': self._query_package_name(), 'remote_webserver': c['remote_webserver'], @@ -435,7 +433,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin 'modules_dir': dirs['abs_modules_dir'], 'installer_path': self.installer_path, 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, 'dm_trans': c['device_manager'], } if self.config["device_manager"] == "sut": diff --git a/testing/mozharness/scripts/b2g_desktop_unittest.py b/testing/mozharness/scripts/b2g_desktop_unittest.py index cd2a55ec384f..a0c9c7098a00 100755 --- a/testing/mozharness/scripts/b2g_desktop_unittest.py +++ b/testing/mozharness/scripts/b2g_desktop_unittest.py @@ -147,8 +147,6 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript): raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], '%s_raw.log' % suite) - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - '%s_errorsummary.log' % suite) str_format_values = { 'application': self.binary_path, 'test_manifest': self.test_manifest, @@ -160,7 +158,6 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript): 'cert_path': dirs['abs_certs_dir'], 'browser_arg': self.config.get('browser_arg'), 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, } missing_key = True diff --git a/testing/mozharness/scripts/b2g_emulator_unittest.py b/testing/mozharness/scripts/b2g_emulator_unittest.py index 1cd23a3d76ca..781e8f2be07d 100755 --- a/testing/mozharness/scripts/b2g_emulator_unittest.py +++ b/testing/mozharness/scripts/b2g_emulator_unittest.py @@ -262,8 +262,6 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin): raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], '%s_raw.log' % suite) - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - '%s_errorsummary.log' % suite) emulator_type = 'x86' if os.path.isdir(os.path.join(dirs['abs_b2g-distro_dir'], 'out', 'target', 'product', 'generic_x86')) else 'arm' self.info("The emulator type: %s" % emulator_type) @@ -283,7 +281,6 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin): 'test_path': self.config.get('test_path'), 'certificate_path': dirs['abs_certs_dir'], 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, } missing_key = True diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index 9d78ca391339..45df7a1f9d94 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -326,16 +326,12 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], '%s_raw.log' % suite) - - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - '%s_errorsummary.log' % suite) str_format_values = { 'binary_path': self.binary_path, 'symbols_path': self._query_symbols_url(), 'abs_app_dir': abs_app_dir, 'abs_res_dir': abs_res_dir, 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, } # TestingMixin._download_and_extract_symbols() will set # self.symbols_path when downloading/extracting. diff --git a/testing/mozharness/scripts/luciddream_unittest.py b/testing/mozharness/scripts/luciddream_unittest.py index 35af4e216cc3..2d802d3e198c 100644 --- a/testing/mozharness/scripts/luciddream_unittest.py +++ b/testing/mozharness/scripts/luciddream_unittest.py @@ -236,7 +236,6 @@ class LuciddreamTest(TestingMixin, MercurialScript, MozbaseMixin, BaseScript, str_format_values = { 'browser_path': self.binary_path, 'raw_log_file': os.path.join(dirs['abs_work_dir'], 'luciddream_raw.log'), - 'error_summary_file': os.path.join(dirs['abs_work_dir'], 'luciddream_errorsummary.log'), 'test_manifest': os.path.join(ld_dir, 'example-tests', 'luciddream.ini') } diff --git a/testing/mozharness/scripts/marionette.py b/testing/mozharness/scripts/marionette.py index 41249df4f379..1f1eb02c8b12 100755 --- a/testing/mozharness/scripts/marionette.py +++ b/testing/mozharness/scripts/marionette.py @@ -342,8 +342,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix raw_log_file = os.path.join(dirs['abs_blob_upload_dir'], 'marionette_raw.log') - error_summary_file = os.path.join(dirs['abs_blob_upload_dir'], - 'marionette_errorsummary.log') config_fmt_args = { 'type': self.config.get('test_type'), # emulator builds require a longer timeout @@ -359,7 +357,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix 'binary': self.binary_path, 'address': self.config.get('marionette_address'), 'raw_log_file': raw_log_file, - 'error_summary_file': error_summary_file, 'gecko_log': dirs["abs_blob_upload_dir"], 'this_chunk': self.config.get('this_chunk', 1), 'total_chunks': self.config.get('total_chunks', 1)