Merge "Honor org.junit.Ignore annotation." into rvc-dev am: 5855ce58e9 am: 0bfc0d20bf

Change-Id: I10db12a3a008cdf36f1608d8ef2e4f169b09643c
This commit is contained in:
Automerger Merge Worker
2020-03-12 15:51:40 +00:00

View File

@@ -11,6 +11,9 @@
{ {
"include-annotation": "android.platform.test.scenario.annotation.Scenario" "include-annotation": "android.platform.test.scenario.annotation.Scenario"
}, },
{
"exclude-annotation": "org.junit.Ignore"
},
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "exclude-annotation": "androidx.test.filters.FlakyTest"
} }
@@ -27,6 +30,9 @@
{ {
"include-annotation": "android.platform.test.scenario.annotation.Scenario" "include-annotation": "android.platform.test.scenario.annotation.Scenario"
}, },
{
"exclude-annotation": "org.junit.Ignore"
},
{ {
"exclude-annotation": "androidx.test.filters.FlakyTest" "exclude-annotation": "androidx.test.filters.FlakyTest"
}, },