Bug 866619 - Part 2: Fix marionette tests for voice registration state. r=allstars.chh
authorEdgar Chen <echen@mozilla.com>
Fri, 19 Jul 2013 15:51:54 +0800
changeset 139337 68bcfde4e82a9ea5b675e0072d495f0f60e95023
parent 139336 260b5acd1940eb3119b64e18c99868c001df434b
child 139338 9497f8c1a115b35c444e9f00784adae5cd15df2a
push id31342
push userjacek@codeweavers.com
push dateSat, 20 Jul 2013 10:40:27 +0000
treeherdermozilla-inbound@68bcfde4e82a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersallstars.chh
bugs866619
milestone25.0a1
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
Bug 866619 - Part 2: Fix marionette tests for voice registration state. r=allstars.chh
dom/network/tests/marionette/test_mobile_data_state.js
dom/network/tests/marionette/test_mobile_voice_state.js
--- a/dom/network/tests/marionette/test_mobile_data_state.js
+++ b/dom/network/tests/marionette/test_mobile_data_state.js
@@ -79,23 +79,18 @@ function testOff() {
   // Set emulator data state to 'off' and verify
   // Expect mobileConnection.data.state to be 'notsearching'
   changeDataStateAndVerify("off", "notSearching", testSearching);
 }
 
 function testSearching() {
   log("Test 4: Searching.");
   // Set emulator data state to 'searching' and verify
-
-  // Bug 819533: WebMobileConnection data/voice state incorrect when emulator
-  // data state is 'searching'. So until fixed, expect 'registered'.
-
-  // changeDataStateAndVerify("searching", "searching", testDenied);
-  log("* When Bug 819533 is fixed, change this test to expect 'searching' *");
-  changeDataStateAndVerify("searching", "registered", testDenied);
+  // Expect mobileConnection.data.state to be 'searching'
+  changeDataStateAndVerify("searching", "searching", testDenied);
 }
 
 function testDenied() {
   log("Test 5: Denied.");
   // Set emulator data state to 'denied' and verify
   // Expect mobileConnection.data.state to be 'denied'
   changeDataStateAndVerify("denied", "denied", testOn);
 }
--- a/dom/network/tests/marionette/test_mobile_voice_state.js
+++ b/dom/network/tests/marionette/test_mobile_voice_state.js
@@ -79,21 +79,16 @@ function testUnregistered() {
     is(connection.voice.emergencyCallsOnly, false);
     is(connection.voice.roaming, false);
 
     testSearching();
   });
 }
 
 function testSearching() {
-  // For some reason, requesting the "searching" state puts the fake modem
-  // into "registered"... Skipping this test for now.
-  testDenied();
-  return;
-
   setEmulatorVoiceState("searching");
 
   connection.addEventListener("voicechange", function onvoicechange() {
     connection.removeEventListener("voicechange", onvoicechange);
 
     is(connection.voice.connected, false);
     is(connection.voice.state, "searching");
     is(connection.voice.emergencyCallsOnly, false);