summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNingyuan Wang <nywang@google.com>2017-07-14 22:27:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-14 22:27:57 +0000
commit56d74cae34989196fbdcba21cbb9fe55298293a0 (patch)
tree4401baba8f3ac8f40c81df16d85c23e6a6a95484
parentb1365c5f66d2cb0bad528b5c94666a7a5c433af5 (diff)
parent5175bdc609b1e4a936ac14b494f19062979ab5b6 (diff)
Merge "Re-enable PNO unit tests for WifiConnectivityManager" into oc-dr1-dev am: b05085d9f7
am: 5175bdc609 Change-Id: I93a18aff705c180a9ae8a46bd77743734b1bd334
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
index f9622d0ac..d4eef041e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
@@ -51,7 +51,6 @@ import com.android.internal.R;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
@@ -533,7 +532,6 @@ public class WifiConnectivityManagerTest {
* because of their low RSSI values.
*/
@Test
- @Ignore("b/32977707")
public void pnoRetryForLowRssiNetwork() {
when(mWifiNS.selectNetwork(anyObject(), anyObject(), anyObject(), anyBoolean(),
anyBoolean(), anyBoolean())).thenReturn(null);
@@ -565,7 +563,6 @@ public class WifiConnectivityManagerTest {
* a candidate while watchdog single scan did.
*/
@Test
- @Ignore("b/32977707")
public void watchdogBitePnoBadIncrementsMetrics() {
// Set screen to off
mWifiConnectivityManager.handleScreenStateChanged(false);
@@ -589,7 +586,6 @@ public class WifiConnectivityManagerTest {
* a candidate which was the same with watchdog single scan.
*/
@Test
- @Ignore("b/32977707")
public void watchdogBitePnoGoodIncrementsMetrics() {
// Qns returns no candidate after watchdog single scan.
when(mWifiNS.selectNetwork(anyObject(), anyObject(), anyObject(), anyBoolean(),