Bug 978071 - Enable mobile data IPv6 tests. r=echen

This commit is contained in:
Jessica Jong 2015-09-08 17:47:04 +08:00
parent de0371e987
commit ca3fcfa46a
2 changed files with 9 additions and 8 deletions

View File

@ -26,7 +26,6 @@ qemu = true
[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]

View File

@ -11,7 +11,7 @@ MARIONETTE_HEAD_JS = "head.js";
*
* 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)
@ -30,12 +30,12 @@ function doTest(aApnSettings, aHaveV4Address, aHaveV6Address) {
.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));
@ -106,14 +106,16 @@ startTestCommon(function() {
.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));