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

Merge "Use staging provisioning server even more" into rvc-dev

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2020-02-29 01:44:38 +00:00
committed by Android (Google) Code Review
parent 5ebb430af7 1c8fac32d3
commit b73c015557
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
View File

@@ -454,7 +454,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
kEmptyServiceCertificate, &key_msg_, &provisioning_server_url); kEmptyServiceCertificate, &key_msg_, &provisioning_server_url);
EXPECT_EQ(NO_ERROR, status); EXPECT_EQ(NO_ERROR, status);
if (NO_ERROR != status) return; if (NO_ERROR != status) return;
EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl);
std::string response = std::string response =
GetCertRequestResponse(config_.provisioning_server()); GetCertRequestResponse(config_.provisioning_server());

4
libwvdrmengine/cdm/test/cdm_feature_test.cpp
View File

@@ -411,7 +411,7 @@ TEST_F(WvCdmFeatureTest, OEMCertificateProvisioning) {
decryptor_.GetProvisioningRequest( decryptor_.GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier, cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server_url)); kEmptyServiceCertificate, &key_msg_, &provisioning_server_url));
EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl);
ClientIdentification_TokenType token_type; ClientIdentification_TokenType token_type;
EXPECT_TRUE(ExtractTokenType(key_msg_, &token_type)); EXPECT_TRUE(ExtractTokenType(key_msg_, &token_type));
@@ -446,7 +446,7 @@ TEST_F(WvCdmFeatureTest, KeyboxProvisioning) {
decryptor_.GetProvisioningRequest( decryptor_.GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier, cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server_url)); kEmptyServiceCertificate, &key_msg_, &provisioning_server_url));
EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl);
ClientIdentification_TokenType token_type; ClientIdentification_TokenType token_type;
EXPECT_TRUE(ExtractTokenType(key_msg_, &token_type)); EXPECT_TRUE(ExtractTokenType(key_msg_, &token_type));

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

@@ -1875,7 +1875,8 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
if (kHttpOk != http_status_code) { if (kHttpOk != http_status_code) {
LogResponseError(message, http_status_code); LogResponseError(message, http_status_code);
} }
EXPECT_EQ(kHttpOk, http_status_code) << message; EXPECT_EQ(kHttpOk, http_status_code)
<< message << "\nwith server_url = " << server_url;
std::string drm_msg; std::string drm_msg;
if (kHttpOk == http_status_code) { if (kHttpOk == http_status_code) {
@@ -2891,7 +2892,7 @@ TEST_F(WvCdmRequestLicenseTest,
cert_type, cert_authority, kDefaultCdmIdentifier, cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, kEmptyServiceCertificate, &key_msg_,
&provisioning_server_url)); &provisioning_server_url));
EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl);
std::string response = std::string response =
GetCertRequestResponse(config_.provisioning_server()); GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size())); EXPECT_NE(0, static_cast<int>(response.size()));