From 1c8fac32d32fc9f788ee9bc4beba0255d59eb5bc Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 26 Feb 2020 14:45:39 -0800 Subject: [PATCH] Use staging provisioning server even more Merge from Widevine repo of http://go/wvgerrit/94745 I missed a few in http://go/wvgerrit/94067 Test: ran unit tests Bug: 149622735 Change-Id: I2289adb05bbd41376528e09bbaa62430644a3e20 --- libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp | 2 +- libwvdrmengine/cdm/test/cdm_feature_test.cpp | 4 ++-- libwvdrmengine/cdm/test/request_license_test.cpp | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp index 3c6c4d31..7ae4a0ed 100644 --- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp +++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp @@ -454,7 +454,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase { kEmptyServiceCertificate, &key_msg_, &provisioning_server_url); EXPECT_EQ(NO_ERROR, status); if (NO_ERROR != status) return; - EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); + EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); diff --git a/libwvdrmengine/cdm/test/cdm_feature_test.cpp b/libwvdrmengine/cdm/test/cdm_feature_test.cpp index b915dad7..f00011c8 100644 --- a/libwvdrmengine/cdm/test/cdm_feature_test.cpp +++ b/libwvdrmengine/cdm/test/cdm_feature_test.cpp @@ -411,7 +411,7 @@ TEST_F(WvCdmFeatureTest, OEMCertificateProvisioning) { decryptor_.GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server_url)); - EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); + EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl); ClientIdentification_TokenType token_type; EXPECT_TRUE(ExtractTokenType(key_msg_, &token_type)); @@ -446,7 +446,7 @@ TEST_F(WvCdmFeatureTest, KeyboxProvisioning) { decryptor_.GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server_url)); - EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); + EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl); ClientIdentification_TokenType token_type; EXPECT_TRUE(ExtractTokenType(key_msg_, &token_type)); diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 27a90972..f49f4e02 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -1875,7 +1875,8 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase { if (kHttpOk != 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; if (kHttpOk == http_status_code) { @@ -2891,7 +2892,7 @@ TEST_F(WvCdmRequestLicenseTest, cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server_url)); - EXPECT_EQ(provisioning_server_url, config_.provisioning_server()); + EXPECT_EQ(provisioning_server_url, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size()));