From 578923dcdc99d44da3c6116f462e0ad5b22e49e9 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 12 Sep 2017 21:26:17 -0400 Subject: [PATCH] Bug 1367895 - Remove some obsolete nightly_only & release_or_beta test manifest annotations. r=mconley --- browser/base/content/test/urlbar/browser.ini | 8 +++----- browser/modules/test/browser/browser.ini | 5 ++--- dom/plugins/test/mochitest/mochitest.ini | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/browser/base/content/test/urlbar/browser.ini b/browser/base/content/test/urlbar/browser.ini index 04e0193d9209..7419a15a3f90 100644 --- a/browser/base/content/test/urlbar/browser.ini +++ b/browser/base/content/test/urlbar/browser.ini @@ -39,6 +39,9 @@ support-files = [browser_locationBarExternalLoad.js] [browser_moz_action_link.js] [browser_new_tab_urlbar_reset.js] +[browser_page_action_menu.js] +[browser_page_action_menu_clipboard.js] +subsuite = clipboard [browser_pasteAndGo.js] subsuite = clipboard [browser_removeUnsafeProtocolsFromURLBarPaste.js] @@ -127,8 +130,3 @@ run-if = e10s subsuite = clipboard support-files = test_wyciwyg_copying.html -[browser_page_action_menu.js] -run-if = nightly_build # Photon only -[browser_page_action_menu_clipboard.js] -run-if = nightly_build # Photon only -subsuite = clipboard diff --git a/browser/modules/test/browser/browser.ini b/browser/modules/test/browser/browser.ini index d04fe954bccd..89f10318d9b0 100644 --- a/browser/modules/test/browser/browser.ini +++ b/browser/modules/test/browser/browser.ini @@ -10,6 +10,7 @@ skip-if = !e10s # Bug 1373549 skip-if = !e10s # Bug 1373549 [browser_BrowserUITelemetry_syncedtabs.js] skip-if = !e10s # Bug 1373549 +[browser_bug1319078.js] [browser_ContentSearch.js] support-files = contentSearch.js @@ -19,7 +20,6 @@ support-files = !/browser/components/search/test/head.js !/browser/components/search/test/testEngine.xml [browser_PageActions.js] -run-if = nightly_build # Photon only [browser_PermissionUI.js] [browser_PermissionUI_prompts.js] [browser_ProcessHangNotifications.js] @@ -32,6 +32,7 @@ skip-if = !e10s skip-if = os != "win" [browser_UnsubmittedCrashHandler.js] run-if = crashreporter +[browser_urlBar_zoom.js] [browser_UsageTelemetry.js] [browser_UsageTelemetry_private_and_restore.js] [browser_UsageTelemetry_urlbar.js] @@ -45,5 +46,3 @@ support-files = usageTelemetrySearchSuggestions.xml [browser_UsageTelemetry_content.js] [browser_UsageTelemetry_content_aboutHome.js] -[browser_urlBar_zoom.js] -[browser_bug1319078.js] diff --git a/dom/plugins/test/mochitest/mochitest.ini b/dom/plugins/test/mochitest/mochitest.ini index 2239f423542a..dd9eceb17a6f 100644 --- a/dom/plugins/test/mochitest/mochitest.ini +++ b/dom/plugins/test/mochitest/mochitest.ini @@ -87,7 +87,6 @@ skip-if = !crashreporter || e10s skip-if = !crashreporter || e10s [test_hidden_plugin.html] [test_instance_re-parent.html] -skip-if = release_or_beta # Bug 1172627 [test_instance_unparent1.html] [test_instance_unparent2.html] [test_instance_unparent3.html]