diff -r 000000000000 -r 6474c204b198 dom/telephony/test/marionette/test_outgoing_remote_hangup_held.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/telephony/test/marionette/test_outgoing_remote_hangup_held.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,118 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 60000;
+
+let outNumber = "5555551111";
+let outgoingCall;
+
+function dial() {
+  log("Make an outgoing call.");
+
+  telephony.dial(outNumber).then(call => {
+    outgoingCall = call;
+    ok(outgoingCall);
+    is(outgoingCall.number, outNumber);
+    is(outgoingCall.state, "dialing");
+
+    is(outgoingCall, telephony.active);
+    is(telephony.calls.length, 1);
+    is(telephony.calls[0], outgoingCall);
+
+    outgoingCall.onalerting = function onalerting(event) {
+      log("Received 'alerting' call event.");
+
+      is(outgoingCall, event.call);
+      is(outgoingCall.state, "alerting");
+
+      emulator.run("gsm list", function(result) {
+        log("Call list is now: " + result);
+        is(result[0], "outbound to  " + outNumber + " : ringing");
+        is(result[1], "OK");
+        answer();
+      });
+    };
+  });
+}
+
+function answer() {
+  log("Answering the outgoing call.");
+
+  // We get no "connecting" event when the remote party answers the call.
+
+  outgoingCall.onconnected = function onconnected(event) {
+    log("Received 'connected' call event.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "connected");
+
+    is(outgoingCall, telephony.active);
+
+    emulator.run("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "outbound to  " + outNumber + " : active");
+      is(result[1], "OK");
+      hold();
+    });
+  };
+  emulator.run("gsm accept " + outNumber);
+}
+
+function hold() {
+  log("Holding the outgoing call.");
+
+  outgoingCall.onholding = function onholding(event) {
+    log("Received 'holding' call event.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "holding");
+
+    is(outgoingCall, telephony.active);
+  };
+
+  outgoingCall.onheld = function onheld(event) {
+    log("Received 'held' call event.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "held");
+
+    is(telephony.active, null);
+    is(telephony.calls.length, 1);
+    is(telephony.calls[0], outgoingCall);
+
+    emulator.run("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "outbound to  " + outNumber + " : held");
+      is(result[1], "OK");
+      hangUp();
+    });
+  };
+  outgoingCall.hold();
+}
+
+function hangUp() {
+  log("Hanging up the outgoing call (remotely).");
+
+  // We get no 'disconnecting' event when remote party hangs-up the call
+
+  outgoingCall.ondisconnected = function ondisconnected(event) {
+    log("Received 'disconnected' call event.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "disconnected");
+
+    is(telephony.active, null);
+    is(telephony.calls.length, 0);
+
+    emulator.run("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "OK");
+      cleanUp();
+    });
+  };
+  emulator.run("gsm cancel " + outNumber);
+}
+
+function cleanUp() {
+  finish();
+}
+
+startTest(function() {
+  dial();
+});