Merge "Migrate FLAKY options from modules to test suites." into main (18998d2d) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+2 −6

Original line number	Diff line number	Diff line
		@@ -10,14 +10,10 @@
		]
		},
		{
		"name": "CtsBRSTestCases",
		"options": [
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "org.junit.Ignore"}
		]
		"name": "CtsBRSTestCases"
		},
		{
		"name": "FrameworksServicesTests_com_android_server_usage_Presubmit"
		"name": "FrameworksServicesTests_com_android_server_usage"
		}
		],
		"postsubmit": [

core/tests/coretests/Android.bp

+0 −38

Original line number	Diff line number	Diff line
		@@ -287,11 +287,6 @@ android_ravenwood_test {
		auto_gen_config: true,
		}

		FLAKY_OR_IGNORED = [
		"androidx.test.filters.FlakyTest",
		"org.junit.Ignore",
		]

		test_module_config {
		name: "FrameworksCoreTests_Presubmit",
		base: "FrameworksCoreTests",
		@@ -300,7 +295,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -325,7 +319,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.content.ContextTest"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -336,7 +329,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.app.KeyguardManagerTest"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -347,7 +339,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.app.PropertyInvalidatedCacheTests"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -362,7 +353,6 @@ test_module_config {
		"android.content.ComponentCallbacksControllerTest",
		"android.content.ContextWrapperTest",
		],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -373,7 +363,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.database.sqlite.SQLiteRawStatementTest"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -385,7 +374,6 @@ test_module_config {
		],
		include_filters: ["android.net"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -498,7 +486,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["com.android.internal.jank"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -557,7 +544,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["com.android.internal.util.LatencyTrackerTest"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -568,7 +554,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.content.ContentCaptureOptionsTest"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -590,7 +575,6 @@ test_module_config {
		],
		include_filters: ["android.content.pm."],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -602,7 +586,6 @@ test_module_config {
		],
		include_filters: ["android.content.pm."],
		include_annotations: ["android.platform.test.annotations.Postsubmit"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -630,7 +613,6 @@ test_module_config {
		],
		include_filters: ["android.content.res."],
		include_annotations: ["android.platform.test.annotations.Postsubmit"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -660,7 +642,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.view.contentcapture"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -671,7 +652,6 @@ test_module_config {
		"device-platinum-tests",
		],
		include_filters: ["android.view.contentprotection"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -683,7 +663,6 @@ test_module_config {
		],
		include_filters: ["com.android.internal.content."],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -696,21 +675,6 @@ test_module_config {
		include_filters: ["android.graphics.drawable.IconTest"],
		}

		test_module_config {
		name: "FrameworksCoreTests_accessibility_NO_FLAKES",
		base: "FrameworksCoreTests",
		test_suites: [
		"device-tests",
		"device-platinum-tests",
		],
		include_filters: [
		"com.android.internal.accessibility",
		"android.accessibilityservice",
		"android.view.accessibility",
		],
		exclude_annotations: ["androidx.test.filters.FlakyTest"],
		}

		test_module_config {
		name: "FrameworksCoreTests_accessibility",
		base: "FrameworksCoreTests",
		@@ -780,7 +744,6 @@ test_module_config {
		"com.android.internal.jank.InteractionJankMonitorTest",
		"com.android.internal.util.LatencyTrackerTest",
		],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

		test_module_config {
		@@ -791,5 +754,4 @@ test_module_config {
		"device-platinum-tests",
		],
		include_annotations: ["android.platform.test.annotations.PlatinumTest"],
		exclude_annotations: FLAKY_OR_IGNORED,
		}

services/accessibility/TEST_MAPPING

+6 −26

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsAccessibilityServiceTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		"name": "CtsAccessibilityServiceTestCases"
		},
		{
		"name": "CtsAccessibilityTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		"name": "CtsAccessibilityTestCases"
		},
		{
		"name": "CtsUiAutomationTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		"name": "CtsUiAutomationTestCases"
		},
		{
		"name": "FrameworksServicesTests_accessibility_Presubmit"
		"name": "FrameworksServicesTests_accessibility"
		},
		{
		"name": "FrameworksCoreTests_accessibility_NO_FLAKES"
		"name": "FrameworksCoreTests_accessibility"
		}
		],
		"postsubmit": [
		@@ -45,12 +30,7 @@
		"name": "CtsUiAutomationTestCases"
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.accessibility"
		}
		]
		"name": "FrameworksServicesTests_accessibility"
		},
		{
		"name": "FrameworksCoreTests_accessibility"

services/core/java/com/android/server/logcat/TEST_MAPPING

+2 −5

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksServicesTests_android_server_logcat_Presubmit"
		"name": "FrameworksServicesTests_android_server_logcat"
		}
		],
		"postsubmit": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.logcat"}
		]
		"name": "FrameworksServicesTests_android_server_logcat"
		}
		]
		}

services/tests/mockingservicestests/Android.bp

+1 −13

Original line number	Diff line number	Diff line
		@@ -138,8 +138,6 @@ android_ravenwood_test {
		auto_gen_config: true,
		}

		FLAKY = ["androidx.test.filters.FlakyTest"]

		test_module_config {
		name: "FrameworksMockingServicesTests_blob",
		base: "FrameworksMockingServicesTests",
		@@ -152,7 +150,6 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.DeviceIdleControllerTest"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -161,7 +158,6 @@ test_module_config {
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.AppStateTrackerTest"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -177,7 +173,6 @@ test_module_config {
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.alarm"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -185,7 +180,7 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.job"],
		exclude_annotations: FLAKY + ["androidx.test.filters.LargeTest"],
		exclude_annotations: ["androidx.test.filters.LargeTest"],
		}

		test_module_config {
		@@ -200,7 +195,6 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.tare"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -215,7 +209,6 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["android.service.games"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -245,7 +238,6 @@ test_module_config {
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.am."],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -265,7 +257,6 @@ test_module_config {
		test_suites: ["device-tests"],
		// Matches appop too
		include_filters: ["com.android.server.app"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -301,7 +292,6 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.pm"],
		exclude_annotations: FLAKY + ["org.junit.Ignore"],
		}

		test_module_config {
		@@ -309,7 +299,6 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.power"],
		exclude_annotations: FLAKY,
		}

		test_module_config {
		@@ -324,7 +313,6 @@ test_module_config {
		base: "FrameworksMockingServicesTests",
		test_suites: ["device-tests"],
		include_filters: ["com.android.server.trust"],
		exclude_annotations: FLAKY,
		}

		test_module_config {