Merge pull request #25262 from zacc/bug_1056008

Bug 1056008 - Remove tbpl-manifest.ini, replace with instructions and di...

tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini

@@ -1,121 +1,29 @@
-[DEFAULT]
-b2g = true
 
-[unit/settings/test_settings.py]
-[unit/test_cleanup_gaia.py]
-[unit/test_cleanup_storage.py]
-[unit/test_cold_launch.py]
-[unit/test_contacts.py]
-[unit/test_file_manager.py]
-[unit/test_kill.py]
-[unit/test_killall.py]
-[unit/test_launch_l10n.py]
-[unit/test_launch_twice.py]
-[unit/test_lock_screen.py]
-[unit/test_permissions.py]
-[unit/test_resources.py]
-[unit/test_prefs.py]
-[unit/test_warm_launch.py]
+# This manifest file has been removed from use.
 
-[accessibility/ftu/test_a11y_ftu_desktopb2g.py]
-#  Test after test_a11y_ftu_desktopb2g is always failing
-skip-if = os == "mac"
-[accessibility/keyboard/test_a11y_keyboard_key_names.py]
-[accessibility/keyboard/test_a11y_keyboard_word_suggestions.py]
-[accessibility/lockscreen/test_a11y_unlock_to_homescreen.py]
-# Bug 1013970 -  test_a11y_unlock_to_homescreen fails on MacOS TBPL
-skip-if = os == "mac"
-disabled = Bug 1022132 Intermittent Failure on TBPL
+# All Treeherder/Gip jobs now share the device manifest files.
 
-[accessibility/phone/test_a11y_phone_keypad.py]
-[accessibility/phone/test_a11y_phone_select_toolbars.py]
-[accessibility/phone/test_a11y_phone_edit_contact.py]
-[accessibility/settings/test_a11y_slider_visibility.py]
-[accessibility/settings/test_a11y_color_filters.py]
-[accessibility/system/test_a11y_cards_view.py]
-[accessibility/system/test_a11y_notification_visibility.py]
-[accessibility/system/test_a11y_screen_manager.py]
-[accessibility/system/test_a11y_utility_tray_notifications.py]
-[accessibility/system/test_a11y_utility_tray_settings.py]
-[accessibility/system/test_a11y_utility_tray_visibility.py]
-[accessibility/system/test_a11y_volume_buttons.py]
-[accessibility/system/test_a11y_volume_buttons_panel_visibility.py]
+# Please only disable the test for the environment you intend so as not to compromise
+# on-device test coverage (often the behaviour of tests differs between the two platforms)
 
-[functional/browser/test_browser_bookmark.py]
-[functional/browser/test_browser_lan.py]
-[functional/browser/test_browser_navigation.py]
-[functional/calendar/test_calendar_flick_through_months.py]
-[functional/calendar/test_calendar_new_event_appears_on_all_calendar_views.py]
-[functional/cards_view/test_cards_view_kill_apps_with_two_apps.py]
-skip-if = os == "mac"
-[functional/cards_view/test_cards_view_with_two_apps.py]
-disabled = Bug 946130
-[functional/clock/test_clock_create_new_alarm.py]
-[functional/clock/test_clock_set_alarm.py]
-[functional/contacts/test_add_contact_to_favorites.py]
-[functional/contacts/test_add_new_contact.py]
-[functional/contacts/test_add_photo_to_contact.py]
-[functional/contacts/test_delete_contact.py]
-[functional/contacts/test_edit_contact.py]
-[functional/contacts/test_export_contacts_to_sdcard.py]
-[functional/contacts/test_import_contacts_from_sdcard.py]
-[functional/contacts/test_sort_contacts.py]
-[functional/dialer/test_dialer_add_contact.py]
-[functional/ftu/test_ftu_with_tour.py]
-[functional/gallery/test_gallery_crop_photo.py]
-# Bug 1009114 - Editing an image (Image Editor) does not work on TBPL/Travis using Linux 64 slaves
-skip-if = os = "linux"
-[functional/gallery/test_gallery_delete_image.py]
-[functional/gallery/test_gallery_edit_photo.py]
-# Bug 1009114 - Editing an image (Image Editor) does not work on TBPL/Travis using Linux 64 slaves
-skip-if = os == "linux"
-[functional/gallery/test_gallery_empty.py]
-[functional/gallery/test_gallery_flick.py]
-[functional/homescreen/test_homescreen_delete_app.py]
-[functional/homescreen/test_homescreen_edit_mode.py]
-# Bug 1027708 - Investigate test_cleanup_gaia.py failure
-skip-if = os == "mac"
-[functional/homescreen/test_homescreen_launch_app.py]
-[functional/homescreen/test_homescreen_move_app.py]
-[functional/keyboard/test_email_keyboard.py]
-[functional/keyboard/test_keyboard.py]
-[functional/keyboard/test_keyboard_predictive_key.py]
-[functional/keyboard/test_number_keyboard.py]
-[functional/lockscreen/test_lockscreen_notification.py]
-[functional/lockscreen/test_lockscreen_unlock_to_homescreen.py]
-[functional/lockscreen/test_lockscreen_wake_with_notification.py]
-[functional/messages/test_sms_add_contact.py]
-# Bug 982086 - Disable failing SMS test on MacOS TBPL
-skip-if = os == "mac"
-[functional/messages/test_sms_contact_input_validation.py]
-[functional/messages/test_sms_contact_match.py]
-[functional/messages/test_mms_add_subject.py]
-[functional/messages/test_inbox_to_settings.py]
-disabled = true
-[functional/music/test_music_empty.py]
-[functional/settings/test_settings_change_keyboard_language.py]
-[functional/settings/test_settings_change_language.py]
-[functional/settings/test_settings_do_not_track.py]
-[functional/settings/test_settings_gps.py]
-skip-if = os == "mac"
-[functional/settings/test_settings_media_storage.py]
-[functional/settings/test_settings_passcode.py]
-[functional/settings/test_settings_wallpaper.py]
-# Bug 973232 - test_settings_wallpaper fails on macos
-skip-if = os == "mac"
-[functional/system/test_power_button_long_press.py]
-[functional/system/test_privileged_app_contacts_prompt.py]
-disabled = true
-[functional/system/test_privileged_app_device_music_prompt.py]
-[functional/system/test_privileged_app_device_picture_prompt.py]
-[functional/system/test_privileged_app_device_sdcard_prompt.py]
-[functional/system/test_privileged_app_device_video_prompt.py]
-[functional/system/test_quick_settings.py]
-[functional/system/test_system_message.py]
-[functional/system/test_system_message_pending.py]
-[functional/system/test_inter_app_comm.py]
-[functional/system/test_system_notification_bar.py]
-[functional/videoplayer/test_play_ogg_video.py]
-[functional/videoplayer/test_play_ogv_video.py]
-[functional/videoplayer/test_play_webm_video.py]
-[functional/videoplayer/test_video_empty.py]
+# Some example manifest commands to use are:
+
+# Disable only for Treeherder/desktopb2g:
+# skip-if = device == "desktop"
+
+# Skip only for MacOS on Treeherder/desktopb2g:
+# skip-if = device == "desktop" && os = "mac"
+
+# Run only on Flame device
+# run-if = device == "flame"
+
+# To find the manifest files for respective Gip jobs:
+
+# Gip (a)
+# gaiatest/tests/accessibility/manifest.ini
+
+# Gip (f)
+# gaiatest/tests/functional/manifest.ini
+
+# Gip (u)
+# gaiatest/tests/unit/manifest.ini