Merge "Ignore flaky ApexSystemServicesTestCases." (979bfc03) · Commits · e / os / android_frameworks_base

TEST_MAPPING

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,9 @@
	"options": [		"options": [
	{		{
	"exclude-annotation": "androidx.test.filters.FlakyTest"		"exclude-annotation": "androidx.test.filters.FlakyTest"
			},
			{
			"exclude-annotation": "org.junit.Ignore"
	}		}
	]		]
	},		},

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;

	import org.junit.After;		import org.junit.After;
	import org.junit.Before;		import org.junit.Before;
			import org.junit.Ignore;
	import org.junit.Rule;		import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.rules.RuleChain;		import org.junit.rules.RuleChain;
	@@ -80,6 +81,7 @@ public class ApexSystemServicesTestCases extends BaseHostJUnit4Test {
	.doesNotContain("FakeApexSystemService onStart");		.doesNotContain("FakeApexSystemService onStart");
	}		}

			@Ignore
	@Test		@Test
	public void testApexSystemServiceStarts() throws Exception {		public void testApexSystemServiceStarts() throws Exception {
	// Pre-install the apex		// Pre-install the apex
	@@ -94,6 +96,7 @@ public class ApexSystemServicesTestCases extends BaseHostJUnit4Test {
	.contains("FakeApexSystemService onStart");		.contains("FakeApexSystemService onStart");
	}		}

			@Ignore
	@Test		@Test
	public void testInitOrder() throws Exception {		public void testInitOrder() throws Exception {
	// Pre-install the apex		// Pre-install the apex