Bug 1499316 - Tweak fetchConfig.js to fix test failures in MozMill account/test-mail-account-setup-wizard.js. rs=bustage-fix a=jorgk
authorJorg K <jorgk@jorgk.com>
Thu, 25 Oct 2018 15:18:54 +0200
changeset 33453 53867f882e8eb69b45c1553cc96921ba0b9908ef
parent 33452 83d9ed5fcb0198485e3d94d0c607f31dd8a65ceb
child 33454 a7e374bef2b8405098b322c2da12ca3be8ec6c46
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustage-fix, jorgk
bugs1499316
Bug 1499316 - Tweak fetchConfig.js to fix test failures in MozMill account/test-mail-account-setup-wizard.js. rs=bustage-fix a=jorgk
mail/components/accountcreation/content/fetchConfig.js
--- a/mail/components/accountcreation/content/fetchConfig.js
+++ b/mail/components/accountcreation/content/fetchConfig.js
@@ -9,34 +9,35 @@
  * Params @see fetchConfigFromISP()
  */
 
 ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/JXON.js");
 
 function fetchConfigFromDisk(domain, successCallback, errorCallback) {
-  return new TimeoutAbortable(runAsync(function() {
+  // Disabled, see bug 1499316.
+  // return new TimeoutAbortable(runAsync(function() {
     try {
       // <TB installdir>/isp/example.com.xml
       var configLocation = Services.dirsvc.get("CurProcD", Ci.nsIFile);
       configLocation.append("isp");
       configLocation.append(sanitize.hostname(domain) + ".xml");
 
       if (!configLocation.exists() || !configLocation.isReadable()) {
         errorCallback("local file not found");
         return;
       }
       var contents =
         readURLasUTF8(Services.io.newFileURI(configLocation));
       let domParser = new DOMParser();
       successCallback(readFromXML(JXON.build(
         domParser.parseFromString(contents, "text/xml"))));
     } catch (e) { errorCallback(e); }
-  }));
+  // }));
 }
 
 /**
  * Tries to get a configuration from the ISP / mail provider directly.
  *
  * Disclaimers:
  * - To support domain hosters, we cannot use SSL. That means we
  *   rely on insecure DNS and http, which means the results may be