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

Merge "Quit test setup when test is skipped" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-03-26 23:00:40 +00:00
committed by Android (Google) Code Review
parent ee77a96d74 202350959d
commit 24027c5ebf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/test/duration_use_case_test.cpp
View File

@@ -1062,6 +1062,7 @@ class CdmUseCase_LicenseWithRenewal : public RenewalTest {
void SetUp() override { void SetUp() override {
RenewalTest::SetUp(); RenewalTest::SetUp();
if(Test::IsSkipped()) return;
const uint64_t next_renewal = const uint64_t next_renewal =
start_of_playback_ + initial_policy_.renewal_delay; start_of_playback_ + initial_policy_.renewal_delay;
// Allow playback within the initial renewal window. // Allow playback within the initial renewal window.
@@ -1267,6 +1268,7 @@ class CdmUseCase_LicenseWithRenewalPlayback : public RenewalTest {
void SetUp() override { void SetUp() override {
RenewalTest::SetUp(); RenewalTest::SetUp();
if(Test::IsSkipped()) return;
uint64_t next_renewal = start_of_playback_ + initial_policy_.renewal_delay; uint64_t next_renewal = start_of_playback_ + initial_policy_.renewal_delay;
// Allow playback within the initial renewal window. // Allow playback within the initial renewal window.
SleepUntil(start_of_playback_); SleepUntil(start_of_playback_);
@@ -1584,6 +1586,7 @@ class CdmUseCase_RenewOnLicenseLoad : public RenewalTest {
void SetUp() override { void SetUp() override {
RenewalTest::SetUp(); RenewalTest::SetUp();
if(Test::IsSkipped()) return;
// The Renew on License Load feature is only supported on v18+ servers. // The Renew on License Load feature is only supported on v18+ servers.
if (config_.ServerOlderThan(18) || if (config_.ServerOlderThan(18) ||
wvoec::global_features.api_version < 18) { wvoec::global_features.api_version < 18) {
@@ -1731,6 +1734,7 @@ class CdmUseCase_Heartbeat : public RenewalTest {
void SetUp() override { void SetUp() override {
RenewalTest::SetUp(); RenewalTest::SetUp();
if(Test::IsSkipped()) return;
const uint64_t next_renewal = const uint64_t next_renewal =
start_of_playback_ + initial_policy_.renewal_delay; start_of_playback_ + initial_policy_.renewal_delay;
// Allow playback within the initial renewal window. // Allow playback within the initial renewal window.