Add SDK version and API level specific tests to the flaky CTS test group
Bug: 17419067
Change-Id: Ia095a01b06a52d50f6c516f7da6fe0ecf22c22a0
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index b403ce1..aa5bbf1 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -164,7 +164,6 @@
# CTS Stable plan
plan = tools.TestPlan(packages)
- plan.Exclude(r'android\.display')
plan.Exclude(r'com\.android\.cts\.browserbench')
for package, test_list in flaky_tests.iteritems():
plan.ExcludeTests(package, test_list)
@@ -173,7 +172,6 @@
# CTS Flaky plan - inversion of CTS Stable
plan = tools.TestPlan(packages)
plan.Exclude('.*')
- plan.Include(r'android\.display')
plan.Include(r'com\.android\.cts\.browserbench')
for package, test_list in flaky_tests.iteritems():
plan.Include(package)
@@ -189,6 +187,8 @@
'cts.ActivityManagerTest#testIsRunningInTestHarness',
'cts.AlertDialogTest#testAlertDialogCancelable',
'cts.ExpandableListActivityTest#testCallback',],
+ 'android.dpi' : [
+ 'cts.DefaultManifestAttributesSdkTest#testPackageHasExpectedSdkVersion',],
'android.hardware' : [
'camera2.cts.CameraDeviceTest#testCameraDeviceRepeatingRequest',
'camera2.cts.ImageReaderTest#testImageReaderFromCameraJpeg',
@@ -215,6 +215,9 @@
'wifi.cts.NsdManagerTest#testAndroidTestCaseSetupProperly',
'wifi.cts.ScanResultTest#testAndroidTestCaseSetupProperly',
'wifi.cts.ScanResultTest#testScanResultTimeStamp',],
+ 'android.os' : [
+ 'cts.BuildVersionTest#testReleaseVersion',
+ 'cts.BuildTest#testIsSecureUserBuild',],
'android.security' : [
'cts.BannedFilesTest#testNoSu',
'cts.BannedFilesTest#testNoSuInPath',