Backed out changeset 29a1c6a34550 (bug 958782) for bustage on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 23 Jun 2014 15:36:57 +0200
changeset 190200 853c1946f8b369974250a3e39cd21ddf150100ee
parent 190199 8e6d92bd2dd9f5b8852008a0b661e1accd197231
child 190201 31891562861280a4b915fe7d7ac4c029962333f7
push id7411
push userkwierso@gmail.com
push dateTue, 24 Jun 2014 02:07:45 +0000
treeherderfx-team@cc4602e0c1d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs958782
milestone33.0a1
backs out29a1c6a34550c29d07882e9910133507718bccd3
Backed out changeset 29a1c6a34550 (bug 958782) for bustage on a CLOSED TREE
dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js
dom/permission/tests/test_sms.html
dom/tests/mochitest/general/test_interfaces.html
--- a/dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js
+++ b/dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js
@@ -72,18 +72,31 @@ function addTest(text, segments, charsPe
 
     domRequest.onerror = function(e) {
       ok(false, "Failed to call getSegmentInfoForText().");
       tasks.finish();
     };
   });
 }
 
-addTest(null, 1, PDU_MAX_USER_DATA_7BIT,
-        PDU_MAX_USER_DATA_7BIT - "null".length);
+function addTestThrows(text) {
+  tasks.push(function() {
+    log("Testing '" + text + "' ...");
+    try {
+      let domRequest = manager.getSegmentInfoForText(text);
+
+      ok(false, "Not thrown.");
+      tasks.finish();
+    } catch (e) {
+      tasks.next();
+    }
+  });
+}
+
+addTestThrows(null);
 
 // Testing "undefined".
 addTest(undefined, 1, PDU_MAX_USER_DATA_7BIT,
         PDU_MAX_USER_DATA_7BIT - "undefined".length);
 
 // Testing numeric values.
 addTest(0,   1, PDU_MAX_USER_DATA_7BIT, PDU_MAX_USER_DATA_7BIT - "0".length);
 addTest(1.0, 1, PDU_MAX_USER_DATA_7BIT, PDU_MAX_USER_DATA_7BIT - "1".length);
--- a/dom/permission/tests/test_sms.html
+++ b/dom/permission/tests/test_sms.html
@@ -16,17 +16,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <pre id="test">
 <script type="application/javascript;version=1.8" src="file_framework.js"></script>
 <script type="application/javascript;version=1.8">
 var gData = [
   {
     perm: ["sms"],
     needParentPerm: true,
     obj: "mozMobileMessage",
-    webidl: "MozMobileMessageManager",
+    idl: "nsIDOMMozMobileMessageManager",
     settings: [["dom.sms.enabled", true]],
   },
 ]
 </script>
 </pre>
 </body>
 </html>
 
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -662,17 +662,17 @@ var interfaceNamesInGlobalScope =
     {name: "MozMobileConnection", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozMobileConnectionArray", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozMobileConnectionInfo", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozMobileNetworkInfo", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozMobileMessageManager", b2g: true, pref: "dom.sms.enabled"},
+    "MozMobileMessageManager",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MozMobileMessageThread",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MozNamedAttrMap",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozNDEFRecord", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozNFCPeer", b2g: true},