| commit | 2b12970061dbe7c16545883b243c9a14d5bdc29c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Feb 06 09:04:38 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 06 09:04:38 2018 +0000 |
| tree | 7bb67546c5e265060ea7a50e7e5d4f3bc32f58fa | |
| parent | cffe307fa5b4b23f9b500bf06662200444166e9d [diff] | |
| parent | c86b195cd5bdec16ad51aa7f1adc56c1ec4bf564 [diff] |
Merge "Frameworks: Mark tests" am: c86b195cd5 Change-Id: I07af71812c623a14bd8df098e9991a331bdecbc2
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 6e643a3..e7abede 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -318,6 +318,7 @@ // This test has an inherent race condition in it, and cannot be enabled for continuous testing // or presubmit tests. It is kept for manual runs and documentation purposes. + @Ignore public void verifyThatNotWaitingForIdleCausesRaceConditions() { // Bring up a network that we can use to send messages to ConnectivityService. ConditionVariable cv = waitForConnectivityBroadcasts(1);
diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index b235ccc7..8ac659f 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java
@@ -599,6 +599,7 @@ /** * Verify the watchLocalOnlyHotspot call goes to WifiServiceImpl. */ + @Test public void testWatchLocalOnlyHotspot() throws Exception { TestLocalOnlyHotspotObserver observer = new TestLocalOnlyHotspotObserver();