From cb2b2ef73cd245b61292d2f8b524dc2da40df99e Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Thu, 18 May 2017 17:07:16 -0700
Subject: [PATCH] Skip ConnOnActivityStartTest and CoreSettingsObserverTest.

- ConnOnActivityStartTest is consistently failing because the device
doesn't have network connectivity. This test probably needs to be moved to a
different test suite but for now just skipping the tests.
- CoreSettingsObserverTest is failing because the test depends on a mock
settings provider but since the Settings class caches the provider
object, the test will end up using real settings provider and fails.

Bug: 38432755
Bug: 38433611
Test: N/A
Change-Id: I0504d9f0df14a0f952e32c8572eefe9ccfebfd2c
---
 .../src/com/android/server/am/CoreSettingsObserverTest.java     | 2 ++
 .../src/com/android/server/net/ConnOnActivityStartTest.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java b/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java
index 19defe158122b..2f202d98647f3 100644
--- a/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java
@@ -36,6 +36,7 @@ import com.android.server.AppOpsService;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -58,6 +59,7 @@ import java.io.File;
  * Run: adb shell am instrument -e class com.android.server.am.CoreSettingsObserverTest -w \
  *     com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
  */
+@Ignore
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class CoreSettingsObserverTest {
diff --git a/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java b/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
index 901453976f058..f02cf5183e2f8 100644
--- a/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
+++ b/services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
@@ -54,6 +54,7 @@ import libcore.io.IoUtils;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -78,6 +79,7 @@ import java.util.concurrent.TimeUnit;
  * Run: adb shell am instrument -e class com.android.server.net.ConnOnActivityStartTest -w \
  *     com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
  */
+@Ignore
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class ConnOnActivityStartTest {