Backed out changeset 0507c090702b (bug 1525856) for devtool failures in devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
authorDorel Luca <dluca@mozilla.com>
Sat, 02 Mar 2019 02:25:07 +0200
changeset 519937 8ffa5f870efb9ae97f73072bafb3a870b3cbec73
parent 519936 811caa480654d82a931322faa2a9b38c766212c9
child 519938 45b70e8a557b8e179ab87a66ade201eed0257196
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1525856
milestone67.0a1
backs out0507c090702b82431521119b5d6f9873d8e0486f
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
Backed out changeset 0507c090702b (bug 1525856) for devtool failures in devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
@@ -16,57 +16,39 @@ add_task(async function setup() {
     [ "privacy.trackingprotection.fingerprinting.enabled", false ],
   ]});
 });
 
 async function testIdentityState(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   ok(!ContentBlocking.content.hasAttribute("detected"), "cryptominers are not detected");
   ok(BrowserTestUtils.is_hidden(ContentBlocking.iconBox), "icon box is not visible");
 
   promise = waitForContentBlockingEvent();
 
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("cryptomining", "*");
   });
 
   await promise;
 
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
   is(ContentBlocking.iconBox.hasAttribute("hasException"), hasException,
     "Shows an exception when appropriate");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 async function testSubview(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   promise = waitForContentBlockingEvent();
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("cryptomining", "*");
   });
   await promise;
 
   await openIdentityPopup();
 
@@ -89,29 +71,31 @@ async function testSubview(hasException)
   let mainView = document.getElementById("identity-popup-mainView");
   viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
   let backButton = subview.querySelector(".subviewbutton-back");
   backButton.click();
   await viewShown;
 
   ok(true, "Main view was shown");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 add_task(async function test() {
+  let uri = Services.io.newURI("https://example.org");
+
   Services.prefs.setBoolPref(CM_PREF, true);
 
   await testIdentityState(false);
-  await testIdentityState(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testIdentityState(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   await testSubview(false);
-  await testSubview(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testSubview(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   Services.prefs.clearUserPref(CM_PREF);
 });
 
--- a/browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
@@ -16,57 +16,39 @@ add_task(async function setup() {
     [ "privacy.trackingprotection.cryptomining.enabled", false ],
   ]});
 });
 
 async function testIdentityState(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   ok(!ContentBlocking.content.hasAttribute("detected"), "fingerprinters are not detected");
   ok(BrowserTestUtils.is_hidden(ContentBlocking.iconBox), "icon box is not visible");
 
   promise = waitForContentBlockingEvent();
 
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("fingerprinting", "*");
   });
 
   await promise;
 
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
   is(ContentBlocking.iconBox.hasAttribute("hasException"), hasException,
     "Shows an exception when appropriate");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 async function testSubview(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   promise = waitForContentBlockingEvent();
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("fingerprinting", "*");
   });
   await promise;
 
   await openIdentityPopup();
 
@@ -89,29 +71,31 @@ async function testSubview(hasException)
   let mainView = document.getElementById("identity-popup-mainView");
   viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
   let backButton = subview.querySelector(".subviewbutton-back");
   backButton.click();
   await viewShown;
 
   ok(true, "Main view was shown");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 add_task(async function test() {
+  let uri = Services.io.newURI("https://example.org");
+
   Services.prefs.setBoolPref(FP_PREF, true);
 
   await testIdentityState(false);
-  await testIdentityState(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testIdentityState(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   await testSubview(false);
-  await testSubview(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testSubview(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   Services.prefs.clearUserPref(FP_PREF);
 });