Failing android.content.ContentResolver tests to CTS staging

bug:19620776
Change-Id: Ie8e2aa9a08a72c183cd045034a6b3c9591805ff8
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 2fd71a8..5ecede8 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -159,6 +159,7 @@
     plan.Include('com\.android\.cts\..*')#TODO(stuartscott): Should PDK have all these?
     self.__WritePlan(plan, 'PDK')
 
+    temporarily_known_failure_tests = BuildCtsTemporarilyKnownFailureList();
     flaky_tests = BuildCtsFlakyTestList()
     releasekey_tests = BuildListForReleaseBuildTest()
 
@@ -190,6 +191,8 @@
     for package, test_list in small_tests.iteritems():
       plan.Include(package+'$')
     plan.Exclude(r'com\.android\.cts\.browserbench')
+    for package, test_list in temporarily_known_failure_tests.iteritems():
+      plan.ExcludeTests(package, test_list)
     for package, test_list in flaky_tests.iteritems():
       plan.ExcludeTests(package, test_list)
     for package, test_list in releasekey_tests.iteritems():
@@ -274,6 +277,9 @@
       plan.Exclude(package+'$')
     for package, tests_list in new_test_packages.iteritems():
       plan.Exclude(package+'$')
+    for package, test_list in temporarily_known_failure_tests.iteritems():
+      plan.Include(package+'$')
+      plan.IncludeTests(package, test_list)
     plan.Exclude(r'com\.drawelements\.')
     plan.Exclude(r'android\.hardware$')
     plan.Exclude(r'android\.media$')
@@ -457,6 +463,41 @@
           'com.android.cts.filesystemperf.RandomRWTest#testRandomUpdate',],
       '' : []}
 
+def BuildCtsTemporarilyKnownFailureList():
+  """ Construct a defaultdict that maps package name to a list of tests
+      that are known failures during dev cycle but expected to be fixed before launch """
+  return {
+      'android.content' : [
+          'android.content.cts.ContentResolverTest#testAndroidTestCaseSetupProperly',
+          'android.content.cts.ContentResolverTest#testBulkInsert',
+          'android.content.cts.ContentResolverTest#testCancelableQuery_WhenCanceledBeforeQuery_ThrowsImmediately',
+          'android.content.cts.ContentResolverTest#testCancelableQuery_WhenCanceledDuringLongRunningQuery_CancelsQueryAndThrows',
+          'android.content.cts.ContentResolverTest#testCancelableQuery_WhenNotCanceled_ReturnsResultSet',
+          'android.content.cts.ContentResolverTest#testConstructor',
+          'android.content.cts.ContentResolverTest#testCrashOnLaunch',
+          'android.content.cts.ContentResolverTest#testCrashingOpenAssetFileDescriptor',
+          'android.content.cts.ContentResolverTest#testCrashingOpenTypedAssetFileDescriptor',
+          'android.content.cts.ContentResolverTest#testCrashingQuery',
+          'android.content.cts.ContentResolverTest#testDelete',
+          'android.content.cts.ContentResolverTest#testGetType',
+          'android.content.cts.ContentResolverTest#testInsert',
+          'android.content.cts.ContentResolverTest#testNotifyChange1',
+          'android.content.cts.ContentResolverTest#testNotifyChange2',
+          'android.content.cts.ContentResolverTest#testOpenAssetFileDescriptor',
+          'android.content.cts.ContentResolverTest#testOpenFileDescriptor',
+          'android.content.cts.ContentResolverTest#testOpenInputStream',
+          'android.content.cts.ContentResolverTest#testOpenOutputStream',
+          'android.content.cts.ContentResolverTest#testQuery',
+          'android.content.cts.ContentResolverTest#testRegisterContentObserver',
+          'android.content.cts.ContentResolverTest#testStableToUnstableRefs',
+          'android.content.cts.ContentResolverTest#testStartCancelSync',
+          'android.content.cts.ContentResolverTest#testStartSyncFailure',
+          'android.content.cts.ContentResolverTest#testUnstableGetType',
+          'android.content.cts.ContentResolverTest#testUnstableToStableRefs',
+          'android.content.cts.ContentResolverTest#testUpdate',
+          'android.content.cts.ContentResolverTest#testValidateSyncExtrasBundle',],
+      '' : []}
+
 def LogGenerateDescription(name):
   print 'Generating test description for package %s' % name