Merge "Exclude androidx.test.filters.FlakyTest in TEST_MAPPING" into udc-dev am: bc28899ee4 am: 6401506ab9 am: f0ed5cbef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24005116 Change-Id: I3a627e5e7e0e513df7fe926778e72ec5cdbe35f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -35,6 +35,9 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
|
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"exclude-annotation": "androidx.test.filters.FlakyTest"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -142,6 +145,9 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
|
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"exclude-annotation": "androidx.test.filters.FlakyTest"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user