commit 7c52e4d731c96684635e1812184f772f675179b5
author Unsuk Jung <unsuk@google.com> Thu Oct 23 09:24:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 23 09:24:43 2014 +0000
tree 61d019356f1affa7ad9c722a618b064c09d2ab49
parent 96d61247922aeb13587b218cf19c56126c33ebf3
parent 5c37dce4eb697b2264c4b12d5753267120646e60

am 5c37dce4: am c189d58d: Add redundant com.android.org.conscrypt tests to knownfailures

* commit '5c37dce4eb697b2264c4b12d5753267120646e60':
  Add redundant com.android.org.conscrypt tests to knownfailures

tests/expectations/knownfailures.txt

diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index d931855..2d2d460 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -361,5 +361,14 @@
     "android.uirendering.cts.testclasses.FontRenderingTests"
   ],
   bug: 17109280
+},
+{
+  description: "android.keystore tests will replace these tests",
+  names: [
+    "com.android.org.conscrypt.MacTest#test_getInstance_OpenSSL_ENGINE",
+    "com.android.org.conscrypt.NativeCryptoTest#test_ENGINE_by_id_TestEngine",
+    "com.android.org.conscrypt.SignatureTest#test_getInstance_OpenSSL_ENGINE"
+  ],
+  bug: 18030049
 }
 ]