Merge "Disable Flaky Key Id Length Tests" into mnc-dev

This commit is contained in:
Fred Gylys-Colwell
2015-06-19 22:27:25 +00:00
committed by Android (Google) Code Review

View File

@@ -4722,7 +4722,7 @@ TEST_F(GenericCryptoTest, KeyDurationVerify) {
ASSERT_EQ(OEMCrypto_ERROR_KEY_EXPIRED, sts); ASSERT_EQ(OEMCrypto_ERROR_KEY_EXPIRED, sts);
} }
TEST_F(GenericCryptoTest, ShortKeyId) { TEST_F(GenericCryptoTest, DISABLED_ShortKeyId) {
OEMCryptoResult sts; OEMCryptoResult sts;
Session s; Session s;
s.open(); s.open();
@@ -4755,7 +4755,7 @@ TEST_F(GenericCryptoTest, ShortKeyId) {
ASSERT_EQ(clear_buffer_, resultant); ASSERT_EQ(clear_buffer_, resultant);
} }
TEST_F(GenericCryptoTest, LongKeyId) { TEST_F(GenericCryptoTest, DISABLED_LongKeyId) {
OEMCryptoResult sts; OEMCryptoResult sts;
Session s; Session s;
s.open(); s.open();
@@ -4788,7 +4788,7 @@ TEST_F(GenericCryptoTest, LongKeyId) {
ASSERT_EQ(clear_buffer_, resultant); ASSERT_EQ(clear_buffer_, resultant);
} }
TEST_F(GenericCryptoTest, CommonPrefixKeyId) { TEST_F(GenericCryptoTest, DISABLED_CommonPrefixKeyId) {
OEMCryptoResult sts; OEMCryptoResult sts;
Session s; Session s;
s.open(); s.open();