Backed out changeset b964b4e0f62f (bug 1588500) for MozMill test failures. a=backout
authorJorg K <jorgk@jorgk.com>
Sat, 26 Oct 2019 11:14:49 +0200
changeset 36489 08af05c34c82f5367122d2c08661ffbf3b0e192d
parent 36488 d7074a5597c76e36322ee3af1198b803cca24eb4
child 36490 216ae52769a8675888c33b953e972c3d03e1fda8
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1588500
backs outb964b4e0f62f479270d65f0c61065eaa2dc9af1a
Backed out changeset b964b4e0f62f (bug 1588500) for MozMill test failures. a=backout
mail/test/mozmill/message-header/test-phishing-bar.js
--- a/mail/test/mozmill/message-header/test-phishing-bar.js
+++ b/mail/test/mozmill/message-header/test-phishing-bar.js
@@ -122,22 +122,17 @@ function assert_ignore_works(aController
 }
 
 /**
  * Helper function to click the first link in a message if one is available.
  */
 function click_link_if_available() {
   let msgBody = mc.e("messagepane").contentDocument.body;
   if (msgBody.getElementsByTagName("a").length > 0) {
-    let a = msgBody.getElementsByTagName("a")[0];
-    a.addEventListener("click", event => {
-      // Let's not try to open an external browser.
-      event.stopPropagation();
-    });
-    a.click();
+    msgBody.getElementsByTagName("a")[0].click();
   }
 }
 
 /**
  * Test that when viewing a message, choosing ignore hides the the phishing
  * notification.
  */
 function test_ignore_phishing_warning_from_message() {
@@ -201,32 +196,39 @@ function test_ignore_phishing_warning_fr
  * We'll have http://130.128.4.1 vs. http://130.128.4.1/
  */
 function test_no_phishing_warning_for_ip_sameish_text() {
   be_in_folder(folder);
   select_click_row(2); // Mail with Public IP address.
   click_link_if_available();
   assert_notification_displayed(mc, kBoxId, kNotificationValue, false); // not shown
 }
+// Bug 1588500
+test_no_phishing_warning_for_ip_sameish_text.EXCLUDED_PLATFORMS = [
+  "linux",
+  "winnt",
+];
 
 /**
  * Test that when viewing a message with a link whose base domain matches but
  * has a different subdomain (e.g. http://subdomain.google.com/ vs
  * http://google.com/), we don't get a warning if the link is pressed.
  */
 function test_no_phishing_warning_for_subdomain() {
   be_in_folder(folder);
   select_click_row(3);
   click_link_if_available();
   assert_notification_displayed(mc, kBoxId, kNotificationValue, false); // not shown
 
   select_click_row(4);
   click_link_if_available();
   assert_notification_displayed(mc, kBoxId, kNotificationValue, false); // not shown
 }
+// Bug 1588500
+test_no_phishing_warning_for_subdomain.EXCLUDED_PLATFORMS = ["linux", "winnt"];
 
 /**
  * Test that when clicking a link where the text and/or href
  * has no TLD, we still warn as appropriate.
  */
 function test_phishing_warning_for_local_domain() {
   be_in_folder(folder);
   select_click_row(5);
@@ -236,16 +238,18 @@ function test_phishing_warning_for_local
   plan_for_modal_dialog("commonDialog", function(ctrler) {
     dialogAppeared = true;
   });
 
   click_link_if_available();
 
   return dialogAppeared;
 }
+// Bug 1588500
+test_phishing_warning_for_local_domain.EXCLUDED_PLATFORMS = ["linux", "winnt"];
 
 /**
  * Test that we warn about emails which contain <form>s with action attributes.
  */
 function test_phishing_warning_for_action_form() {
   be_in_folder(folder);
   select_click_row(6);
   assert_notification_displayed(mc, kBoxId, kNotificationValue, true); // shown