mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-04 13:07:52 +00:00
Bug 1272414 - rip out qemu/browser/b2g flags from marionette manifests, r=AutomatedTester
MozReview-Commit-ID: 9RjGgykh0pR --HG-- extra : rebase_source : a5bc5e888cc24e05fb4b5843c3738aa5456aea80
This commit is contained in:
Gijs Kruitbosch
parent
8d48dd5f83
commit
29525495be
@ -1,8 +1,5 @@
|
||||
[DEFAULT]
|
||||
qemu = false
|
||||
b2g = false
|
||||
browser = true
|
||||
skip = false
|
||||
run-if = buildapp == 'browser'
|
||||
|
||||
[test_refresh_firefox.py]
|
||||
|
||||
|
||||
@ -13,9 +13,7 @@
|
||||
; seems to work.
|
||||
|
||||
[DEFAULT]
|
||||
b2g = false
|
||||
browser = true
|
||||
qemu = false
|
||||
run-if = buildapp == 'browser'
|
||||
|
||||
[chrome/content/shared/test/test_shared_all.py]
|
||||
[chrome/content/panels/test/test_desktop_all.py]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = false
|
||||
browser = true
|
||||
qemu = false
|
||||
run-if = buildapp == 'browser'
|
||||
|
||||
[test_1_browser_call.py]
|
||||
[test_2_linkclicker.py]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_battery_level.js]
|
||||
[test_battery_status_charging.js]
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = false
|
||||
|
||||
# Hint: "disabled = xxxxx" statement should be added *below* the test that
|
||||
# we want to disable.
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_dom_BluetoothManager.js]
|
||||
skip-if = android_version < '19'
|
||||
@ -13,11 +8,11 @@ skip-if = android_version < '19'
|
||||
[test_dom_BluetoothAdapter_setters.js]
|
||||
skip-if = android_version < '19'
|
||||
[test_dom_BluetoothDevice.js]
|
||||
disabled = Bug 1175389
|
||||
skip-if = true # Bug 1175389
|
||||
|
||||
[test_dom_BluetoothAdapter_discovery.js]
|
||||
disabled = Bug 1175389
|
||||
skip-if = true # Bug 1175389
|
||||
|
||||
[test_dom_BluetoothAdapter_pair.js]
|
||||
disabled = Bug 1175389
|
||||
skip-if = true # Bug 1175389
|
||||
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_cellbroadcast_etws.js]
|
||||
[test_cellbroadcast_gsm.js]
|
||||
[test_cellbroadcast_gsm_language_and_body.js]
|
||||
disabled = Bug 1231462
|
||||
skip-if = true # Bug 1231462
|
||||
[test_cellbroadcast_multi_sim.js]
|
||||
[test_cellbroadcast_umts.js]
|
||||
[test_cellbroadcast_umts_language_and_body.js]
|
||||
disabled = Bug 1224992
|
||||
skip-if = true # Bug 1224992
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_sensor_orientation.js]
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
; We don't support FM radio emulation yet, see bug 872417
|
||||
qemu = false
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_enable_disable.js]
|
||||
[test_set_frequency.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_icc_contact_read.js]
|
||||
[test_icc_contact_add.js]
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_mobile_networks.js]
|
||||
[test_mobile_voice_state.js]
|
||||
[test_mobile_voice_location.js]
|
||||
[test_mobile_operator_names.js]
|
||||
[test_mobile_operator_names_plmnlist.js]
|
||||
disabled = Bug 1234746
|
||||
skip-if = true # Bug 1234746
|
||||
[test_mobile_operator_names_roaming.js]
|
||||
[test_mobile_preferred_network_type.js]
|
||||
[test_mobile_preferred_network_type_radio_off.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
;[test_between_emulators.py]
|
||||
[test_bug814761.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_ethernet_add_interface.js]
|
||||
[test_ethernet_remove_interface.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g=true
|
||||
browser=false
|
||||
qemu=true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_ndef.js]
|
||||
[test_nfc_enabled.js]
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_geolocation.js]
|
||||
disabled = Bug 808783
|
||||
skip-if = true # Bug 808783
|
||||
[test_fakevolume.js]
|
||||
[test_ril_code_quality.py]
|
||||
[test_screen_state.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_proximity_init.js]
|
||||
[test_proximity_change.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_audiomanager_phonestate.js]
|
||||
[test_call_mute.js]
|
||||
@ -25,9 +23,9 @@ qemu = true
|
||||
[test_emergency.js]
|
||||
[test_emergency_label.js]
|
||||
[test_gsm_cdma_incoming_basic_operations.js]
|
||||
disabled = Bug 1214537
|
||||
skip-if = true # Bug 1214537
|
||||
[test_gsm_cdma_outgoing_basic_operations.js]
|
||||
disabled = Bug 1214537
|
||||
skip-if = true # Bug 1214537
|
||||
[test_incall_mmi_call_hold.js]
|
||||
[test_incall_mmi_call_waiting.js]
|
||||
[test_incall_mmi_conference.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_wifi_tethering_enabled.js]
|
||||
; The following test must be the last tethering test ran, as it sets the
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_voicemail_dsds_default_service_id.js]
|
||||
[test_voicemail_number.js]
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = true
|
||||
browser = false
|
||||
qemu = true
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
[test_wifi_enable.js]
|
||||
[test_wifi_scan.js]
|
||||
|
||||
@ -1,15 +1,5 @@
|
||||
[DEFAULT]
|
||||
; true if the test requires an emulator, otherwise false
|
||||
qemu = false
|
||||
|
||||
; true if the test is compatible with the browser, otherwise false
|
||||
browser = true
|
||||
|
||||
; true if the test is compatible with b2g, otherwise false
|
||||
b2g = true
|
||||
|
||||
; true if the test should be skipped
|
||||
skip = false
|
||||
run-if = buildapp == 'browser'
|
||||
|
||||
[test_accessiblecaret_cursor_mode.py]
|
||||
[test_accessiblecaret_selection_mode.py]
|
||||
|
||||
@ -319,12 +319,6 @@ class BaseMarionetteArguments(ArgumentParser):
|
||||
help='host to use for adb connection')
|
||||
self.add_argument('--adb-port',
|
||||
help='port to use for adb connection')
|
||||
self.add_argument('--type',
|
||||
help="the type of test to run, can be a combination of values defined in the manifest file; "
|
||||
"individual values are combined with '+' or '-' characters. for example: 'browser+b2g' "
|
||||
"means the set of tests which are compatible with both browser and b2g; 'b2g-qemu' means "
|
||||
"the set of tests which are compatible with b2g but do not require an emulator. this "
|
||||
"argument is only used when loading tests from manifest files")
|
||||
self.add_argument('--homedir',
|
||||
help='home directory of emulator files')
|
||||
self.add_argument('--app',
|
||||
@ -540,7 +534,7 @@ class BaseMarionetteTestRunner(object):
|
||||
emulator_img=None, emulator_res='480x800', homedir=None,
|
||||
app=None, app_args=None, binary=None, profile=None,
|
||||
logger=None, no_window=False, logdir=None, logcat_stdout=False,
|
||||
repeat=0, testvars=None, tree=None, type=None,
|
||||
repeat=0, testvars=None, tree=None,
|
||||
device_serial=None, symbols_path=None, timeout=None,
|
||||
shuffle=False, shuffle_seed=random.randint(0, sys.maxint),
|
||||
sdcard=None, this_chunk=1, total_chunks=1, sources=None,
|
||||
@ -569,7 +563,6 @@ class BaseMarionetteTestRunner(object):
|
||||
self.repeat = repeat
|
||||
self.test_kwargs = kwargs
|
||||
self.tree = tree
|
||||
self.type = type
|
||||
self.device_serial = device_serial
|
||||
self.symbols_path = symbols_path
|
||||
self.timeout = timeout
|
||||
@ -1027,18 +1020,7 @@ setReq.onerror = function() {
|
||||
self.add_test(filepath)
|
||||
return
|
||||
|
||||
testargs = {}
|
||||
if self.type is not None:
|
||||
testtypes = self.type.replace('+', ' +').replace('-', ' -').split()
|
||||
for atype in testtypes:
|
||||
if atype.startswith('+'):
|
||||
testargs.update({ atype[1:]: 'true' })
|
||||
elif atype.startswith('-'):
|
||||
testargs.update({ atype[1:]: 'false' })
|
||||
else:
|
||||
testargs.update({ atype: 'true' })
|
||||
|
||||
testarg_b2g = bool(testargs.get('b2g'))
|
||||
testarg_b2g = mozinfo.info.get('appname') == 'b2g'
|
||||
|
||||
file_ext = os.path.splitext(os.path.split(filepath)[-1])[1]
|
||||
|
||||
@ -1063,18 +1045,12 @@ setReq.onerror = function() {
|
||||
"combination of filters: {}".format(
|
||||
manifest.fmt_filters()))
|
||||
|
||||
unfiltered_tests = []
|
||||
target_tests = []
|
||||
for test in manifest_tests:
|
||||
if test.get('disabled'):
|
||||
self.manifest_skipped_tests.append(test)
|
||||
else:
|
||||
unfiltered_tests.append(test)
|
||||
|
||||
target_tests = manifest.get(tests=unfiltered_tests, **testargs)
|
||||
for test in unfiltered_tests:
|
||||
if test['path'] not in [x['path'] for x in target_tests]:
|
||||
test.setdefault('disabled', 'filtered by type (%s)' % self.type)
|
||||
self.manifest_skipped_tests.append(test)
|
||||
target_tests.append(test)
|
||||
|
||||
for i in target_tests:
|
||||
if not os.path.exists(i["path"]):
|
||||
|
||||
@ -1,16 +1,3 @@
|
||||
[DEFAULT]
|
||||
; true if the test requires an emulator, otherwise false
|
||||
qemu = false
|
||||
|
||||
; true if the test is compatible with the browser, otherwise false
|
||||
browser = true
|
||||
|
||||
; true if the test is compatible with b2g, otherwise false
|
||||
b2g = true
|
||||
|
||||
; true if the test should be skipped
|
||||
skip = false
|
||||
|
||||
; marionette unit tests
|
||||
[include:unit/unit-tests.ini]
|
||||
test_container = true
|
||||
|
||||
@ -1,132 +1,108 @@
|
||||
[DEFAULT]
|
||||
; true if the test requires an emulator, otherwise false
|
||||
qemu = false
|
||||
|
||||
; true if the test is compatible with the browser, otherwise false
|
||||
browser = true
|
||||
|
||||
; true if the test is compatible with b2g, otherwise false
|
||||
b2g = true
|
||||
|
||||
; true if the test should be skipped
|
||||
skip = false
|
||||
|
||||
[test_marionette.py]
|
||||
[test_data_driven.py]
|
||||
[test_session.py]
|
||||
[test_capabilities.py]
|
||||
|
||||
[test_accessibility.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_expectedfail.py]
|
||||
expected = fail
|
||||
[test_import_script.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_click.py]
|
||||
[test_click_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_selected.py]
|
||||
[test_selected_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_getattr.py]
|
||||
[test_getattr_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_elementsize.py]
|
||||
[test_position.py]
|
||||
[test_rendered_element.py]
|
||||
[test_chrome_element_css.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_elementState.py]
|
||||
[test_elementState_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_text.py]
|
||||
[test_text_chrome.py]
|
||||
disabled = "Bug 896046"
|
||||
skip-if = true # "Bug 896046"
|
||||
|
||||
[test_clearing.py]
|
||||
[test_typing.py]
|
||||
|
||||
[test_log.py]
|
||||
[test_emulator.py]
|
||||
qemu = true
|
||||
|
||||
[test_about_pages.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_execute_async_script.py]
|
||||
[test_execute_script.py]
|
||||
[test_simpletest_fail.js]
|
||||
[test_findelement.py]
|
||||
[test_findelement_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_navigation.py]
|
||||
|
||||
[test_timeouts.py]
|
||||
|
||||
[test_element_touch.py]
|
||||
b2g = true
|
||||
browser = false
|
||||
skip-if = buildapp != 'b2g'
|
||||
|
||||
[test_gesture.py]
|
||||
disabled = "Bug 1060060"
|
||||
b2g = true
|
||||
browser = false
|
||||
skip-if = true # buildapp != 'b2g' -- Bug 1060060
|
||||
|
||||
[test_single_finger.py]
|
||||
disabled = "Bug 1060060"
|
||||
b2g = true
|
||||
browser = false
|
||||
skip-if = true # buildapp != 'b2g' -- Bug 1060060
|
||||
[test_single_finger_desktop.py]
|
||||
b2g = false
|
||||
skip-if = os == "win" # Bug 1025040
|
||||
skip-if = buildapp == 'b2g' || os == "win" # Bug 1025040
|
||||
|
||||
[test_multi_finger.py]
|
||||
disabled = "Bug 1060060"
|
||||
b2g = true
|
||||
browser = false
|
||||
skip-if = true # buildapp != 'b2g' -- Bug 1060060
|
||||
|
||||
[test_simpletest_pass.js]
|
||||
[test_simpletest_sanity.py]
|
||||
[test_simpletest_chrome.js]
|
||||
[test_simpletest_timeout.js]
|
||||
[test_anonymous_content.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_switch_frame.py]
|
||||
b2g = false
|
||||
skip-if = os == "win" # Bug 1078237
|
||||
skip-if = buildapp == 'b2g' || os == "win" # Bug 1078237
|
||||
[test_switch_frame_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_switch_remote_frame.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_pagesource.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_visibility.py]
|
||||
[test_window_switching.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_window_management.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_window_position.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_window_handles.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_screenshot.py]
|
||||
[test_cookies.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_window_title.py]
|
||||
[test_window_type.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_implicit_waits.py]
|
||||
[test_wait.py]
|
||||
[test_expected.py]
|
||||
[test_date_time_value.py]
|
||||
[test_getactiveframe_oop.py]
|
||||
disabled = "Bug 925688"
|
||||
b2g = false
|
||||
skip-if = true # buildapp == 'b2g' -- Bug 925688
|
||||
[test_chrome_async_finish.js]
|
||||
[test_screen_orientation.py]
|
||||
[test_errors.py]
|
||||
@ -134,23 +110,20 @@ b2g = false
|
||||
[test_execute_isolate.py]
|
||||
[test_click_scrolling.py]
|
||||
[test_profile_management.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_set_window_size.py]
|
||||
b2g = false
|
||||
skip-if = os == "linux" # Bug 1085717
|
||||
skip-if = buildapp == 'b2g' || os == "linux" # Bug 1085717
|
||||
[test_with_using_context.py]
|
||||
|
||||
[test_modal_dialogs.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_key_actions.py]
|
||||
[test_mouse_action.py]
|
||||
b2g = false
|
||||
skip-if = (os == "win" && !debug && os_version == "6.1") # Bug 1273758
|
||||
skip-if = buildapp == 'b2g' || (os == "win" && !debug && os_version == "6.1") # Bug 1273758
|
||||
[test_teardown_context_preserved.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
[test_file_upload.py]
|
||||
b2g = false
|
||||
skip-if = os == "win" # http://bugs.python.org/issue14574
|
||||
skip-if = buildapp == 'b2g' || os == "win" # http://bugs.python.org/issue14574
|
||||
|
||||
[test_execute_sandboxes.py]
|
||||
[test_using_permissions.py]
|
||||
@ -159,6 +132,6 @@ skip-if = os == "win" # http://bugs.python.org/issue14574
|
||||
[test_shadow_dom.py]
|
||||
|
||||
[test_chrome.py]
|
||||
b2g = false
|
||||
skip-if = buildapp == 'b2g'
|
||||
|
||||
[test_addons.py]
|
||||
|
||||
@ -1,15 +1,5 @@
|
||||
[DEFAULT]
|
||||
; true if the test requires an emulator, otherwise false
|
||||
qemu = false
|
||||
|
||||
; true if the test is compatible with the browser, otherwise false
|
||||
browser = false
|
||||
|
||||
; true if the test is compatible with b2g, otherwise false
|
||||
b2g = true
|
||||
|
||||
; true if the test should be skipped
|
||||
skip = false
|
||||
run-if = buildapp == 'b2g'
|
||||
|
||||
; this is currently only set by high level update smoketests
|
||||
smoketest = false
|
||||
|
||||
@ -1,16 +1,3 @@
|
||||
[DEFAULT]
|
||||
; true if the test requires an emulator, otherwise false
|
||||
qemu = false
|
||||
|
||||
; true if the test is compatible with the browser, otherwise false
|
||||
browser = true
|
||||
|
||||
; true if the test is compatible with b2g, otherwise false
|
||||
b2g = true
|
||||
|
||||
; true if the test should be skipped
|
||||
skip = false
|
||||
|
||||
[include:../../../../../dom/bluetooth/tests/marionette/manifest.ini]
|
||||
[include:../../../../../dom/telephony/test/marionette/manifest.ini]
|
||||
[include:../../../../../dom/voicemail/test/marionette/manifest.ini]
|
||||
|
||||
@ -32,7 +32,7 @@ def setup_argument_parser():
|
||||
from marionette.runner.base import BaseMarionetteArguments
|
||||
return BaseMarionetteArguments()
|
||||
|
||||
def run_marionette(tests, b2g_path=None, emulator=None, testtype=None,
|
||||
def run_marionette(tests, b2g_path=None, emulator=None,
|
||||
address=None, binary=None, topsrcdir=None, **kwargs):
|
||||
from mozlog.structured import commandline
|
||||
|
||||
@ -83,9 +83,6 @@ class B2GCommands(MachCommandBase):
|
||||
@Command('marionette-webapi', category='testing',
|
||||
description='Run a Marionette webapi test (test WebAPIs using marionette).',
|
||||
conditions=[conditions.is_b2g])
|
||||
@CommandArgument('--type',
|
||||
default='b2g',
|
||||
help='Test type, usually one of: browser, b2g, b2g-qemu.')
|
||||
@CommandArgument('--tag', action='append', dest='test_tags',
|
||||
help='Filter out tests that don\'t have the given tag. Can be used '
|
||||
'multiple times in which case the test must contain at least one '
|
||||
|
||||
@ -8,7 +8,6 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
# marionette options
|
||||
"test_type": "b2g",
|
||||
"emulator": "arm",
|
||||
"tooltool_cache": "/builds/tooltool_cache",
|
||||
"test_manifest": "unit-tests.ini",
|
||||
@ -47,7 +46,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -68,7 +66,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -85,7 +82,6 @@ config = {
|
||||
},
|
||||
"marionette_desktop": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--binary=%(binary)s",
|
||||
@ -97,7 +93,6 @@ config = {
|
||||
},
|
||||
"marionette_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--logcat-dir=%(logcat_dir)s",
|
||||
@ -115,7 +110,6 @@ config = {
|
||||
},
|
||||
"webapi_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
|
||||
@ -12,7 +12,6 @@ else:
|
||||
|
||||
config = {
|
||||
# marionette options
|
||||
"test_type": "b2g",
|
||||
"marionette_address": "localhost:2828",
|
||||
"gaiatest": True,
|
||||
"xre_url": xre_url,
|
||||
@ -55,7 +54,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -76,7 +74,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -93,7 +90,6 @@ config = {
|
||||
},
|
||||
"marionette_desktop": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--binary=%(binary)s",
|
||||
@ -105,7 +101,6 @@ config = {
|
||||
},
|
||||
"marionette_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--logcat-dir=%(logcat_dir)s",
|
||||
@ -123,7 +118,6 @@ config = {
|
||||
},
|
||||
"webapi_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
|
||||
@ -5,7 +5,6 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
# marionette options
|
||||
"test_type": "browser",
|
||||
"marionette_address": "localhost:2828",
|
||||
"test_manifest": "unit-tests.ini",
|
||||
|
||||
@ -44,7 +43,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -65,7 +63,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -82,7 +79,6 @@ config = {
|
||||
},
|
||||
"marionette_desktop": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--binary=%(binary)s",
|
||||
@ -94,7 +90,6 @@ config = {
|
||||
},
|
||||
"marionette_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--logcat-dir=%(logcat_dir)s",
|
||||
@ -112,7 +107,6 @@ config = {
|
||||
},
|
||||
"webapi_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
|
||||
config = {
|
||||
# marionette options
|
||||
"test_type": "browser",
|
||||
"marionette_address": "localhost:2828",
|
||||
"test_manifest": "unit-tests.ini",
|
||||
|
||||
@ -18,7 +17,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -39,7 +37,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -56,7 +53,6 @@ config = {
|
||||
},
|
||||
"marionette_desktop": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--binary=%(binary)s",
|
||||
@ -68,7 +64,6 @@ config = {
|
||||
},
|
||||
"marionette_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--logcat-dir=%(logcat_dir)s",
|
||||
@ -86,7 +81,6 @@ config = {
|
||||
},
|
||||
"webapi_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
|
||||
@ -4,7 +4,6 @@ import sys
|
||||
|
||||
config = {
|
||||
# marionette options
|
||||
"test_type": "browser",
|
||||
"marionette_address": "localhost:2828",
|
||||
"test_manifest": "unit-tests.ini",
|
||||
|
||||
@ -46,7 +45,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -67,7 +65,6 @@ config = {
|
||||
"options": [
|
||||
"--restart",
|
||||
"--timeout=%(timeout)s",
|
||||
"--type=%(type)s",
|
||||
"--testvars=%(testvars)s",
|
||||
"--profile=%(profile)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -84,7 +81,6 @@ config = {
|
||||
},
|
||||
"marionette_desktop": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--binary=%(binary)s",
|
||||
@ -96,7 +92,6 @@ config = {
|
||||
},
|
||||
"marionette_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--logcat-dir=%(logcat_dir)s",
|
||||
@ -114,7 +109,6 @@ config = {
|
||||
},
|
||||
"webapi_emulator": {
|
||||
"options": [
|
||||
"--type=%(type)s",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
"--log-errorsummary=%(error_summary_file)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
|
||||
@ -64,13 +64,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
|
||||
"default": "default",
|
||||
"help": "branch of gaia repo to clone"
|
||||
}
|
||||
], [
|
||||
["--test-type"],
|
||||
{"action": "store",
|
||||
"dest": "test_type",
|
||||
"default": "browser",
|
||||
"help": "The type of tests to run",
|
||||
}
|
||||
], [
|
||||
["--marionette-address"],
|
||||
{"action": "store",
|
||||
@ -118,13 +111,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
|
||||
"help": "url of desktop xre archive"
|
||||
}
|
||||
], [
|
||||
["--gip-suite"],
|
||||
{"action": "store",
|
||||
"dest": "gip_suite",
|
||||
"default": None,
|
||||
"help": "gip suite to be executed. If no value is provided, manifest tbpl-manifest.ini will be used. the See Bug 1046694"
|
||||
}
|
||||
], [
|
||||
["--total-chunks"],
|
||||
{"action": "store",
|
||||
"dest": "total_chunks",
|
||||
@ -330,7 +316,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
|
||||
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
|
||||
'timeout': 60000 if self.config.get('emulator') else 10000,
|
||||
'profile': os.path.join(dirs['abs_gaia_dir'], 'profile'),
|
||||
@ -395,19 +380,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
|
||||
# if b2g-bin cannot be found we must use just b2g
|
||||
config_fmt_args['binary'] = os.path.join(binary_path, 'b2g')
|
||||
|
||||
# Bug 1046694
|
||||
# using a different manifest if a specific gip-suite is specified
|
||||
# --type parameter depends on gip-suite
|
||||
if self.config.get('gip_suite'):
|
||||
manifest = os.path.join(dirs['abs_gaiatest_dir'], 'gaiatest', 'tests', self.config.get('gip_suite'),
|
||||
'manifest.ini')
|
||||
if self.config.get('gip_suite') == "functional":
|
||||
config_fmt_args['type'] = "b2g-external"
|
||||
else:
|
||||
# For <v2.2 branches using the old tbpl-manifest.ini and no split gip-suite
|
||||
manifest = os.path.join(dirs['abs_gaiatest_dir'], 'gaiatest', 'tests',
|
||||
'tbpl-manifest.ini')
|
||||
|
||||
else:
|
||||
# Marionette or Marionette-webapi tests
|
||||
cmd = [python, '-u', os.path.join(dirs['abs_marionette_dir'],
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
b2g = false
|
||||
browser = true
|
||||
qemu = false
|
||||
run-if = buildapp == 'browser'
|
||||
|
||||
[test/marionette/test_standards.py]
|
||||
[test/marionette/test_modules.py]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user