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

Update PerOriginProvisioningSupportsOldPaths

Browse Source 
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
This commit is contained in:
Fred Gylys-Colwell
2017-08-18 13:05:08 -07:00
committed by Jeff Tinker
parent e492811200
commit fb1e0623ad
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -1376,8 +1376,12 @@ TEST_F(WvCdmRequestLicenseTest, PerOriginProvisioningSupportsOldPaths) {
// Make sure that the cert exists. // Make sure that the cert exists.
std::vector<std::string> files; std::vector<std::string> files;
ASSERT_TRUE(FileUtils::List(base_path, &files)); ASSERT_TRUE(FileUtils::List(base_path, &files));
ASSERT_EQ(1u, files.size()); ASSERT_LE(1u, files.size());
EXPECT_EQ(kOldFileName, files[0]); 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. // Reprovision the default identifier.
Provision(kDefaultCdmIdentifier, kLevel3); Provision(kDefaultCdmIdentifier, kLevel3);