From 2efc6821d2a48189393d69dfdf8a8cbbaf9600aa Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Mon, 21 Mar 2016 15:51:57 -0700 Subject: [PATCH] Change an ASSERT to an EXPECT Merge from widevine repo of http://go/wvgerrit/17202 This allows more checks in the test to run. Returning the correct error code is less important than the next check, which verifies the signature was not computed. This helps diagnose b/21708882, but does not fix it. b/27787064 Change-Id: I65306c54b77370951bc54e8ef9f6140f58bea32c --- libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index 52aa92d1..ddab2c8a 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -3389,7 +3389,7 @@ class OEMCryptoLoadsCertificateAlternates : public OEMCryptoLoadsCertificate { &signature_length, scheme); } - ASSERT_NE(OEMCrypto_SUCCESS, sts) + EXPECT_NE(OEMCrypto_SUCCESS, sts) << "Signed with forbidden padding scheme=" << (int)scheme << ", size=" << (int)size; vector zero(signature_length, 0);