widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 20b07afa: Merge "Disable Flaky Key Id Length Tests" into mnc-dev

Browse Source 
* commit '20b07afad9f3bd814d8b85d8148db7df6536aff7':
  Disable Flaky Key Id Length Tests
This commit is contained in:
Fred Gylys-Colwell
2015-06-20 00:11:55 +00:00
committed by Android Git Automerger
parent e82024e0b8 20b07afad9
commit 2ba0ab423f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

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