Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9765bcf7 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev

parents fdeb6b8e cb2b2ef7

services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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 {

services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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 {