From e9f15858f0abed11367f6307b73eb534ab512ffb Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Thu, 24 Mar 2016 13:38:00 -0700 Subject: [PATCH] Address failures in Widevine CDM extended duration tests [ Merge of http://go/wvgerrit/17250 ] This appears to be the result of a bad merge. b/27657766 Change-Id: I890162595623f1c13973cedc17eb611fac7e5535 --- libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp index 6e7691e1..e9dae268 100644 --- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp +++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp @@ -260,6 +260,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase { license_type, app_parameters, NULL, EMPTY_ORIGIN, &key_request)); EXPECT_EQ(kKeyRequestTypeInitial, key_request.type); + key_msg_ = key_request.message; EXPECT_EQ(0u, key_request.url.size()); } @@ -278,7 +279,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase { &key_request)); *server_url = key_request.url; - + key_msg_ = key_request.message; EXPECT_EQ(kKeyRequestTypeRenewal, key_request.type); // TODO(edwinwong, rfrias): Add tests cases for when license server url // is empty on renewal. Need appropriate key id at the server. @@ -296,6 +297,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase { kLicenseTypeRelease, app_parameters, NULL, EMPTY_ORIGIN, &key_request)); + key_msg_ = key_request.message; EXPECT_EQ(kKeyRequestTypeRelease, key_request.type); } @@ -533,7 +535,6 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase { EXPECT_EQ(license_id_.type(), id.type()); EXPECT_EQ(license_id_.version(), id.version()); EXPECT_TRUE(!id.provider_session_token().empty()); - EXPECT_NEAR(existing_license.seconds_since_started(), expected_seconds_since_first_playback, kClockTolerance); EXPECT_NEAR(existing_license.seconds_since_last_played(),