Bug 1483378 - Part 2: Remove some obsolete privacy pane tests; r=johannh
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 17 Aug 2018 11:08:38 -0400
changeset 432379 edc4aecf816ee887a1607276aecf3dfda5688334
parent 432378 7784d3275ff735261a8953fc17779223f476023b
child 432380 547b082422b014de300723eb2b7ad679545012e5
push id106719
push usereakhgari@mozilla.com
push dateMon, 20 Aug 2018 15:42:45 +0000
treeherdermozilla-inbound@b3c038572979 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1483378
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1483378 - Part 2: Remove some obsolete privacy pane tests; r=johannh
browser/components/preferences/in-content/tests/browser.ini
browser/components/preferences/in-content/tests/browser_privacypane_3.js
browser/components/preferences/in-content/tests/browser_privacypane_4.js
browser/components/preferences/in-content/tests/browser_privacypane_8.js
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -65,19 +65,17 @@ skip-if = e10s
 [browser_proxy_backup.js]
 [browser_privacypane.js]
 run-if = nightly_build
 # browser_privacypane.js only has Browser Error collection tests currently,
 # which is disabled outside Nightly. Remove this once non-Nightly tests are
 # added.
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
-[browser_privacypane_4.js]
 [browser_privacypane_5.js]
-[browser_privacypane_8.js]
 [browser_sanitizeOnShutdown_prefLocked.js]
 [browser_searchShowSuggestionsFirst.js]
 [browser_searchsuggestions.js]
 [browser_security-1.js]
 [browser_security-2.js]
 [browser_spotlight.js]
 [browser_site_login_exceptions.js]
 [browser_site_autoplay_media_exceptions.js]
--- a/browser/components/preferences/in-content/tests/browser_privacypane_3.js
+++ b/browser/components/preferences/in-content/tests/browser_privacypane_3.js
@@ -8,9 +8,11 @@ if (jar) {
 Services.scriptloader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
 
 run_test_subset([
   test_custom_retention("rememberHistory", "remember"),
   test_custom_retention("rememberHistory", "custom"),
   test_custom_retention("rememberForms", "custom"),
   test_custom_retention("rememberForms", "custom"),
   test_historymode_retention("remember", "custom"),
+  test_custom_retention("alwaysClear", "remember"),
+  test_custom_retention("alwaysClear", "custom"),
 ]);
deleted file mode 100644
--- a/browser/components/preferences/in-content/tests/browser_privacypane_4.js
+++ /dev/null
@@ -1,24 +0,0 @@
-requestLongerTimeout(2);
-
-let rootDir = getRootDirectory(gTestPath);
-let jar = getJar(rootDir);
-if (jar) {
-  let tmpdir = extractJarToTmp(jar);
-  rootDir = "file://" + tmpdir.path + "/";
-}
-/* import-globals-from privacypane_tests_perwindow.js */
-Services.scriptloader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
-let runtime = Services.appInfo;
-
-run_test_subset([
-  test_custom_retention("acceptCookies", "remember"),
-  test_custom_retention("acceptCookies", "custom"),
-  test_custom_retention("acceptThirdPartyMenu", "custom", "visited"),
-  test_custom_retention("acceptThirdPartyMenu", "custom", "always"),
-  test_custom_retention("keepCookiesUntil", "custom", 1),
-  test_custom_retention("keepCookiesUntil", "custom", 2),
-  test_custom_retention("keepCookiesUntil", "custom", 0),
-  test_custom_retention("alwaysClear", "custom"),
-  test_custom_retention("alwaysClear", "custom"),
-  test_historymode_retention("remember", "custom"),
-]);
deleted file mode 100644
--- a/browser/components/preferences/in-content/tests/browser_privacypane_8.js
+++ /dev/null
@@ -1,25 +0,0 @@
-let rootDir = getRootDirectory(gTestPath);
-let jar = getJar(rootDir);
-if (jar) {
-  let tmpdir = extractJarToTmp(jar);
-  rootDir = "file://" + tmpdir.path + "/";
-}
-/* import-globals-from privacypane_tests_perwindow.js */
-Services.scriptloader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
-
-run_test_subset([
-  // history mode should be initialized to remember
-  test_historymode_retention("remember", undefined),
-
-  // history mode should remain remember; toggle acceptCookies checkbox
-  test_custom_retention("acceptCookies", "remember"),
-
-  // history mode should now be custom; set history mode to dontremember
-  test_historymode_retention("dontremember", "custom"),
-
-  // history mode should remain custom; set history mode to remember
-  test_historymode_retention("remember", "custom"),
-
-  // history mode should now be remember
-  test_historymode_retention("remember", "remember"),
-]);