Merge "Add DeviceTypeRule to filter tests only for large screens or foldable" into tm-dev

This commit is contained in:
Nicolò Mazzucato
2022-04-19 07:47:37 +00:00
committed by Android (Google) Code Review

View File

@@ -16,12 +16,6 @@
}, },
{ {
"exclude-annotation": "android.platform.test.annotations.Postsubmit" "exclude-annotation": "android.platform.test.annotations.Postsubmit"
},
{
"exclude-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
},
{
"exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly"
} }
] ]
} }
@@ -93,12 +87,6 @@
}, },
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
},
{
"exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly"
} }
] ]
} }
@@ -115,12 +103,6 @@
}, },
{ {
"exclude-annotation": "org.junit.Ignore" "exclude-annotation": "org.junit.Ignore"
},
{
"exclude-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
},
{
"exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly"
} }
] ]
} }
@@ -143,25 +125,6 @@
] ]
} }
], ],
"large-screen-postsubmit": [
{
"name": "PlatformScenarioTests",
"options" : [
{
"include-filter": "android.platform.test.scenario.sysui"
},
{
"include-annotation": "android.platform.test.scenario.annotation.LargeScreenOnly"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
}
],
"hubui-postsubmit": [ "hubui-postsubmit": [
{ {
"name": "PlatformScenarioTests", "name": "PlatformScenarioTests",