Merge "Enable SystemUIGoogleScreenshotTests on main and disable on udc-qpr-dev" into udc-qpr-dev

This commit is contained in:
David Saff
2023-08-01 19:17:49 +00:00
committed by Android (Google) Code Review

View File

@@ -55,20 +55,6 @@
}
]
},
{
"name": "SystemUIGoogleScreenshotTests",
"options": [
{
"exclude-annotation": "org.junit.Ignore"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "android.platform.test.annotations.Postsubmit"
}
]
},
{
// TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
"name": "SystemUIGoogleBiometricsScreenshotTests",
@@ -151,21 +137,5 @@
}
]
}
],
"postsubmit": [
{
"name": "SystemUIGoogleScreenshotTests",
"options": [
{
"exclude-annotation": "org.junit.Ignore"
},
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"include-annotation": "android.platform.test.annotations.Postsubmit"
}
]
}
]
}