From fb1e0623ad683d55dbfa59b4a39728dcb2f8590c Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Fri, 18 Aug 2017 13:05:08 -0700 Subject: [PATCH] Update PerOriginProvisioningSupportsOldPaths Merge from Widevine repo of http://go/wvgerrit/32067 PerOriginProvisioningSupportsOldPaths is changed to allow for there to be several other device files. bug:64952779 Test: unit tests on bullhead. Change-Id: I0593d95a877c236c9a87c5893bbec22abe25fde9 --- libwvdrmengine/cdm/test/request_license_test.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index d90eeb5e..e4eccc16 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -1376,8 +1376,12 @@ TEST_F(WvCdmRequestLicenseTest, PerOriginProvisioningSupportsOldPaths) { // Make sure that the cert exists. std::vector files; ASSERT_TRUE(FileUtils::List(base_path, &files)); - ASSERT_EQ(1u, files.size()); - EXPECT_EQ(kOldFileName, files[0]); + ASSERT_LE(1u, files.size()); + bool found_it = false; + for(std::string file: files) { + if (file == std::string(kOldFileName)) found_it = true; + } + EXPECT_TRUE(found_it); // Reprovision the default identifier. Provision(kDefaultCdmIdentifier, kLevel3);