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

Merge "Re-enable Binary Provisioning Test Again"

Browse Source
This commit is contained in:
John Bruce
2019-01-17 00:30:42 +00:00
committed by Android (Google) Code Review
parent 3b328bb896 e12a837e14
commit 0c194ff115
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
View File

@@ -315,8 +315,7 @@ TEST_F(WvCdmEnginePreProvTestUat, ProvisioningServiceCertificateInvalidTest) {
TEST_F(WvCdmEnginePreProvTestStaging, ProvisioningTest) { Provision(); } TEST_F(WvCdmEnginePreProvTestStaging, ProvisioningTest) { Provision(); }
// TODO(b/112046733): This test is broken. It should be fixed. TEST_F(WvCdmEnginePreProvTestUatBinary, ProvisioningTest) {
TEST_F(WvCdmEnginePreProvTestUatBinary, DISABLED_ProvisioningTest) {
Provision(); Provision();
} }

2
libwvdrmengine/cdm/core/test/test_base.cpp
View File

@@ -204,8 +204,8 @@ class TestCryptoSessionFactory : public CryptoSessionFactory {
void WvCdmTestBase::SetUp() { void WvCdmTestBase::SetUp() {
::testing::Test::SetUp(); ::testing::Test::SetUp();
Properties::set_provisioning_messages_are_binary(binary_provisioning_);
Properties::Init(); Properties::Init();
Properties::set_provisioning_messages_are_binary(binary_provisioning_);
// Log the current test name, to help with debugging when the log and stdout // Log the current test name, to help with debugging when the log and stdout
// are not the same. // are not the same.
const ::testing::TestInfo* const test_info = const ::testing::TestInfo* const test_info =