Merge "Quit test setup when test is skipped" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
24027c5ebf
@@ -1062,6 +1062,7 @@ class CdmUseCase_LicenseWithRenewal : public RenewalTest {
|
||||
|
||||
void SetUp() override {
|
||||
RenewalTest::SetUp();
|
||||
if(Test::IsSkipped()) return;
|
||||
const uint64_t next_renewal =
|
||||
start_of_playback_ + initial_policy_.renewal_delay;
|
||||
// Allow playback within the initial renewal window.
|
||||
@@ -1267,6 +1268,7 @@ class CdmUseCase_LicenseWithRenewalPlayback : public RenewalTest {
|
||||
|
||||
void SetUp() override {
|
||||
RenewalTest::SetUp();
|
||||
if(Test::IsSkipped()) return;
|
||||
uint64_t next_renewal = start_of_playback_ + initial_policy_.renewal_delay;
|
||||
// Allow playback within the initial renewal window.
|
||||
SleepUntil(start_of_playback_);
|
||||
@@ -1584,6 +1586,7 @@ class CdmUseCase_RenewOnLicenseLoad : public RenewalTest {
|
||||
|
||||
void SetUp() override {
|
||||
RenewalTest::SetUp();
|
||||
if(Test::IsSkipped()) return;
|
||||
// The Renew on License Load feature is only supported on v18+ servers.
|
||||
if (config_.ServerOlderThan(18) ||
|
||||
wvoec::global_features.api_version < 18) {
|
||||
@@ -1731,6 +1734,7 @@ class CdmUseCase_Heartbeat : public RenewalTest {
|
||||
|
||||
void SetUp() override {
|
||||
RenewalTest::SetUp();
|
||||
if(Test::IsSkipped()) return;
|
||||
const uint64_t next_renewal =
|
||||
start_of_playback_ + initial_policy_.renewal_delay;
|
||||
// Allow playback within the initial renewal window.
|
||||
|
||||
Reference in New Issue
Block a user