summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRebecca Silberstein <silberst@google.com>2017-08-17 16:55:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-17 16:55:35 +0000
commit690c99175ebfb3aa2ca92d2100f2a5148f081646 (patch)
treeadbdaef674cac0cfc7df4791de63408caa1951d9 /tests
parent73c4fead1c47e82431d117bffed6ea6c843b7980 (diff)
parentae6cc3065f240990b9600ca802af4f98b2df96cd (diff)
Merge "WifiStateMachineTest: remove looper race" into oc-mr1-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 5d5a5a6aa..be5892196 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -2001,9 +2001,7 @@ public class WifiStateMachineTest {
@Test
public void testStartWps_nullWpsInfo() throws Exception {
loadComponentsInStaMode();
- mWsm.setOperationalMode(WifiStateMachine.CONNECT_MODE);
- assertEquals(WifiStateMachine.CONNECT_MODE, mWsm.getOperationalModeForTest());
- assertEquals("DisconnectedState", getCurrentState().getName());
+
mLooper.startAutoDispatch();
Message reply = mWsmAsyncChannel.sendMessageSynchronously(WifiManager.START_WPS, 0, 0,
null);
@@ -2018,9 +2016,6 @@ public class WifiStateMachineTest {
@Test
public void testSyncDisableNetwork_failure() throws Exception {
loadComponentsInStaMode();
- mWsm.setOperationalMode(WifiStateMachine.CONNECT_MODE);
- assertEquals(WifiStateMachine.CONNECT_MODE, mWsm.getOperationalModeForTest());
- assertEquals("DisconnectedState", getCurrentState().getName());
when(mWifiConfigManager.disableNetwork(anyInt(), anyInt())).thenReturn(false);
mLooper.startAutoDispatch();