Bug 978071 - Enable mobile data IPv6 tests. r=echen
authorJessica Jong <jjong@mozilla.com>
Tue, 08 Sep 2015 17:47:04 +0800
changeset 293902 4d3afc0190a5bcd1ecc8c71612d5bfe438e75e80
parent 293901 7a282b8b0829951b7cbd1fecfeaa433320638c87
child 293903 b0a6a715d05e2e770404e9c102db47e3241977ce
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersechen
bugs978071
milestone43.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 978071 - Enable mobile data IPv6 tests. r=echen
dom/mobileconnection/tests/marionette/manifest.ini
dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js
--- a/dom/mobileconnection/tests/marionette/manifest.ini
+++ b/dom/mobileconnection/tests/marionette/manifest.ini
@@ -21,17 +21,16 @@ qemu = true
 [test_call_barring_change_password.js]
 [test_call_waiting.js]
 [test_mobile_set_radio.js]
 [test_mobile_last_known_network.js]
 [test_mobile_icc_change.js]
 [test_mobile_connections_array_uninitialized.js]
 [test_mobile_signal_strength.js]
 [test_mobile_data_ipv6.js]
-disabled = Bug 979137
 [test_mobile_supported_network_types.js]
 [test_mobile_call_forwarding.js]
 [test_mobile_call_forwarding_set_error.js]
 [test_mobile_call_forwarding_get_error.js]
 [test_mobile_voice_privacy.js]
 [test_dsds_mobile_data_connection.js]
 [test_mobile_clir.js]
 [test_mobile_clir_radio_off.js]
--- a/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js
+++ b/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js
@@ -6,17 +6,17 @@ MARIONETTE_HEAD_JS = "head.js";
 
 /**
  * Test resulting IP address format with given APN settings.
  *
  * This test utility function performs following steps:
  *
  *   1) set "ril.data.apnSettings" to a given settings object,
  *   2) enable data connection and wait for a "datachange" event,
- *   3) check the IP address type of the active network interface,
+ *   3) check the IP address type of the active network info,
  *   4) disable data connection.
  *
  * Fulfill params: (none)
  * Reject params: (none)
  *
  * @param aApnSettings
  *        An APN settings value.
  * @param aIsIPv6
@@ -25,22 +25,22 @@ MARIONETTE_HEAD_JS = "head.js";
  * @return A deferred promise.
  */
 function doTest(aApnSettings, aHaveV4Address, aHaveV6Address) {
   return setDataApnSettings([])
     .then(() => setDataApnSettings(aApnSettings))
     .then(() => setDataEnabledAndWait(true))
     .then(function() {
       let nm = getNetworkManager();
-      let active = nm.active;
-      ok(active, "Active network interface");
-      log("  Interface: " + active.name);
+      let networkInfo = nm.activeNetworkInfo;
+      ok(networkInfo, "Active network info");
+      log("  Interface: " + networkInfo.name);
 
       let ips = {}, prefixLengths = {};
-      let num = active.getAddresses(ips, prefixLengths);
+      let num = networkInfo.getAddresses(ips, prefixLengths);
       log("  Num addresses: " + num);
       log("  Addresses: " + JSON.stringify(ips.value));
       log("  PrefixLengths: " + JSON.stringify(prefixLengths.value));
 
       if (aHaveV4Address) {
         ok(ips.value.reduce(function(aFound, aAddress) {
           return aFound || aAddress.indexOf(":") < 0;
         }), "IPv4 address");
@@ -101,24 +101,26 @@ startTestCommon(function() {
                  "types": ["default", "supl", "mms"] }]];
     })
 
     .then(function(aApnSettings) {
       return Promise.resolve()
 
         .then(() => doTestHome(aApnSettings, "NoSuchProtocol"))
         .then(() => doTestHome(aApnSettings, "IP"))
-        .then(() => doTestHome(aApnSettings, "IPV4V6"))
+        // TODO: Bug 979137 - B2G Emulator: Support the IPV4V6
+        //.then(() => doTestHome(aApnSettings, "IPV4V6"))
         .then(() => doTestHome(aApnSettings, "IPV6"))
 
         .then(() => setEmulatorRoamingAndWait(true))
 
         .then(() => doTestRoaming(aApnSettings, "NoSuchProtocol"))
         .then(() => doTestRoaming(aApnSettings, "IP"))
-        .then(() => doTestRoaming(aApnSettings, "IPV4V6"))
+        // TODO: Bug 979137 - B2G Emulator: Support the IPV4V6
+        //.then(() => doTestRoaming(aApnSettings, "IPV4V6"))
         .then(() => doTestRoaming(aApnSettings, "IPV6"))
 
         .then(() => setEmulatorRoamingAndWait(false));
     })
 
     .then(() => setDataRoamingEnabled(false))
     .then(function() {
       if (origApnSettings) {