Bug 1205687 - Add metadata about Marionette WebAPI tests; r?edgar r?shawnjohnjr
This patch also renames certain test files to avoid
duplication of test names. Because they are all included in
testing/marionette/client/marionette/tests/webapi-tests.ini through
include statements, the test names must be unique.
--- a/dom/mobilemessage/tests/marionette/manifest.ini
+++ b/dom/mobilemessage/tests/marionette/manifest.ini
@@ -1,55 +1,55 @@
[DEFAULT]
b2g = true
browser = false
qemu = true
;[test_between_emulators.py]
-[test_incoming.js]
-[test_outgoing.js]
+[test_bug814761.js]
+[test_decode_spanish_fallback.js]
[test_emulator_loopback.js]
-[test_message_classes.js]
-[test_incoming_delete.js]
-[test_outgoing_delete.js]
+[test_error_of_mms_manual_retrieval.js]
+[test_error_of_mms_send.js]
+[test_error_of_sms_send.js]
+[test_filter_date.js]
+[test_filter_mixed.js]
+[test_filter_number.js]
+[test_filter_read.js]
+[test_filter_received.js]
+[test_filter_sent.js]
+[test_filter_unread.js]
[test_getmessage.js]
[test_getmessage_notfound.js]
[test_getmessages.js]
-[test_filter_date.js]
-[test_filter_number.js]
-[test_filter_received.js]
-[test_filter_sent.js]
-[test_filter_read.js]
-[test_filter_unread.js]
-[test_filter_mixed.js]
-[test_segment_info.js]
-[test_mark_msg_read.js]
-[test_mark_msg_read_error.js]
-[test_bug814761.js]
-[test_strict_7bit_encoding.js]
+[test_getsegmentinfofortext.js]
+[test_getthreads.js]
+[test_incoming_delete.js]
+[test_incoming.js]
[test_incoming_max_segments.js]
-[test_outgoing_max_segments.js]
-[test_update_thread_record_in_delete.js]
+[test_invalid_address.js]
+[test_mark_msg_read_error.js]
+[test_mark_msg_read.js]
[test_massive_incoming_delete.js]
-[test_getsegmentinfofortext.js]
-[test_phone_number_normalization.js]
-[test_invalid_address.js]
-[test_mmsmessage_attachments.js]
-[test_getthreads.js]
-[test_smsc_address.js]
-[test_dsds_default_service_id.js]
-[test_thread_subject.js]
-[test_mmdb_new.js]
-[test_mmdb_setmessagedeliverybyid_sms.js]
+[test_message_classes.js]
[test_mmdb_foreachmatchedmmsdeliveryinfo.js]
[test_mmdb_full_storage.js]
-[test_mmdb_upgradeSchema_current_structure.js]
+[test_mmdb_new.js]
+[test_mmdb_ports_in_cdma_wappush.js]
+[test_mmdb_setmessagedeliverybyid_sms.js]
[test_mmdb_upgradeSchema_22.js]
-[test_mmdb_ports_in_cdma_wappush.js]
-[test_replace_short_message_type.js]
+[test_mmdb_upgradeSchema_current_structure.js]
+[test_mmsmessage_attachments.js]
+[test_mobilemessage_dsds_default_service_id.js]
[test_mt_sms_concatenation.js]
-[test_error_of_mms_manual_retrieval.js]
-[test_error_of_mms_send.js]
-[test_error_of_sms_send.js]
[test_ondeleted_event.js]
-[test_decode_spanish_fallback.js]
+[test_outgoing_delete.js]
+[test_outgoing.js]
+[test_outgoing_max_segments.js]
+[test_outgoing_unstable_voice_connection.js]
+[test_phone_number_normalization.js]
+[test_replace_short_message_type.js]
+[test_segment_info.js]
+[test_smsc_address.js]
+[test_strict_7bit_encoding.js]
+[test_thread_subject.js]
[test_update_gsm_nl_on_mcc_chanages.js]
-[test_outgoing_unstable_voice_connection.js]
+[test_update_thread_record_in_delete.js]
rename from dom/mobilemessage/tests/marionette/test_dsds_default_service_id.js
rename to dom/mobilemessage/tests/marionette/test_mobilemessage_dsds_default_service_id.js
--- a/dom/telephony/test/marionette/manifest.ini
+++ b/dom/telephony/test/marionette/manifest.ini
@@ -15,17 +15,16 @@ qemu = true
[test_conference_two_calls.js]
[test_conference_two_hangup_all.js]
[test_conference_two_hangup_one.js]
[test_conference_two_hold_resume.js]
[test_conference_two_remove_one.js]
[test_consecutive_hold.js]
[test_crash_emulator.js]
[test_dsds_connection_conflict.js]
-[test_dsds_default_service_id.js]
[test_dsds_normal_call.js]
[test_dtmf.js]
[test_emergency.js]
[test_emergency_label.js]
[test_gsm_cdma_incoming_basic_operations.js]
disabled = Bug 1214537
[test_gsm_cdma_outgoing_basic_operations.js]
disabled = Bug 1214537
@@ -36,23 +35,23 @@ disabled = Bug 1214537
[test_incoming_already_connected.js]
[test_incoming_already_held.js]
[test_incoming_answer_hangup_oncallschanged.js]
[test_incoming_onstatechange.js]
[test_mmi_call_barring.js]
[test_mmi_call_forwarding.js]
[test_mmi_call_waiting.js]
[test_mmi_change_barring_password.js]
+[test_mmi_change_pin2.js]
[test_mmi_change_pin.js]
-[test_mmi_change_pin2.js]
[test_mmi_clip.js]
[test_mmi_clir.js]
[test_mmi_imei.js]
+[test_mmi_unlock_puk2.js]
[test_mmi_unlock_puk.js]
-[test_mmi_unlock_puk2.js]
[test_mmi_ussd.js]
skip-if = android_version < '19'
[test_modem_switch_tech.js]
[test_multiple_hold.js]
[test_outgoing_already_held.js]
[test_outgoing_answer_hangup_oncallschanged.js]
[test_outgoing_answer_radio_off.js]
[test_outgoing_auto_hold.js]
@@ -61,11 +60,12 @@ skip-if = android_version < '19'
[test_outgoing_from_stk.js]
[test_outgoing_onstatechange.js]
[test_outgoing_radio_off.js]
[test_outgoing_when_two_calls_on_line.js]
[test_ready.js]
[test_redundant_operations.js]
[test_swap_held_and_active.js]
[test_system_message_telephony_call_ended.js]
+[test_telephony_dsds_default_service_id.js]
[test_TelephonyUtils.js]
[test_temporary_clir.js]
rename from dom/telephony/test/marionette/test_dsds_default_service_id.js
rename to dom/telephony/test/marionette/test_telephony_dsds_default_service_id.js
--- a/dom/voicemail/test/marionette/manifest.ini
+++ b/dom/voicemail/test/marionette/manifest.ini
@@ -1,8 +1,8 @@
[DEFAULT]
b2g = true
browser = false
qemu = true
-[test_voicemail_statuschanged.js]
+[test_voicemail_dsds_default_service_id.js]
[test_voicemail_number.js]
-[test_dsds_default_service_id.js]
+[test_voicemail_statuschanged.js]
rename from dom/voicemail/test/marionette/test_dsds_default_service_id.js
rename to dom/voicemail/test/marionette/test_voicemail_dsds_default_service_id.js