From 92d0e81143738fc6ef1f65d2f37f6de7528623ba Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 30 Sep 2024 09:41:56 -0700 Subject: [PATCH 1/2] Correct CertificateProvisioningTests failures [ Merge of http://go/wvgerrit/207720 ] CertificateProvisioningTests were failing because the expected filename "cert.bin" was not met. The file path being passed in on android was "/data/vendor/mediadrm/IDM0/L[1|3]/cert.bin" Bug: 339917270 Test: CertificateProvisioningTests/CertificateProvisioningTests.ProvisioningResponseSuccess/Keybox Test: CertificateProvisioningTests/CertificateProvisioningTests.ProvisioningResponseSuccess/OemCert Test: CertificateProvisioningTests/CertificateProvisioningTests.ProvisioningResponseSuccess/DrmCertificateReprovisioning Change-Id: I0874b9652d54848d58c202fe197af0da0616e8cd --- .../cdm/core/test/certificate_provisioning_unittest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp index 01328861..fcc62117 100644 --- a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp @@ -131,6 +131,7 @@ namespace wvcdm { using ::testing::_; using ::testing::ByMove; using ::testing::DoAll; +using ::testing::HasSubstr; using ::testing::NiceMock; using ::testing::NotNull; using ::testing::Return; @@ -468,7 +469,7 @@ TEST_P(CertificateProvisioningTest, ProvisioningResponseSuccess) { .WillOnce(DoAll(SaveArg<0>(&stored_certificate), ReturnArg<1>())); MockFileSystem file_system; - EXPECT_CALL(file_system, Open(StrEq(wvutil::kLegacyCertificateFileName), _)) + EXPECT_CALL(file_system, Open(HasSubstr(wvutil::kLegacyCertificateFileName), _)) .Times(1) .WillOnce(Return(ByMove(std::unique_ptr(file)))); From a5a02ac1fbe29b66d88e26df2f96db5d9345eb79 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 30 Sep 2024 12:54:41 -0700 Subject: [PATCH 2/2] Skip ProvisioningStableSpoidTest if L3 [ Merge of http://go/wvgerrit/207790 ] SPOID is only expected to be stable for L1 Bug: 339917270 Test: CoreIntegrationTest.ProvisioningStableSpoidTest Change-Id: I34aab2b5f873b643e2cfb3c7ad8c996f2134a48b --- libwvdrmengine/cdm/core/test/core_integration_test.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/core/test/core_integration_test.cpp b/libwvdrmengine/cdm/core/test/core_integration_test.cpp index 9e7a7186..03bd37f2 100644 --- a/libwvdrmengine/cdm/core/test/core_integration_test.cpp +++ b/libwvdrmengine/cdm/core/test/core_integration_test.cpp @@ -141,8 +141,11 @@ TEST_F(CoreIntegrationTest, ProvisioningStableSpoidTest) { cdm_engine_.QueryStatus(kLevelDefault, QUERY_KEY_SECURITY_LEVEL, &level) .code()); - ASSERT_TRUE(level == QUERY_VALUE_SECURITY_LEVEL_L1 || - level == QUERY_VALUE_SECURITY_LEVEL_L3) + if (level == QUERY_VALUE_SECURITY_LEVEL_L3) { + GTEST_SKIP(); // SPOID is not expected to be stable for L3 + } + + ASSERT_TRUE(level == QUERY_VALUE_SECURITY_LEVEL_L1) << "Unknown security level: " << level; CdmSecurityLevel security_level = level == QUERY_VALUE_SECURITY_LEVEL_L1