Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sudheer Shanka
2017-05-23 00:01:54 +00:00
committed by Android (Google) Code Review
parent fdeb6b8ed3 cb2b2ef73c
commit 9765bcf761
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {

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

@@ -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 {