From 38c45a66a3da935de797502b4b1f664934ee2239 Mon Sep 17 00:00:00 2001 From: John Bruce Date: Wed, 9 Jan 2019 18:49:38 +0000 Subject: [PATCH] Revert "Re-enable Binary Provisioning Test" (The matching reversion in the Widevine Repository is http://go/wvgerrit/69923) This reverts commit c207ef8ea6232da7a2b09be1ab1d4f5774288959. Reason for revert: Widevine Buildbot failures Change-Id: Ied9e36f9eaa94bb7e9cd13b8dff7a2cbdca07a07 --- libwvdrmengine/cdm/core/test/cdm_engine_test.cpp | 3 ++- libwvdrmengine/cdm/core/test/test_base.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp index 010b98a8..f0476ce3 100644 --- a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp @@ -315,7 +315,8 @@ TEST_F(WvCdmEnginePreProvTestUat, ProvisioningServiceCertificateInvalidTest) { TEST_F(WvCdmEnginePreProvTestStaging, ProvisioningTest) { Provision(); } -TEST_F(WvCdmEnginePreProvTestUatBinary, ProvisioningTest) { +// TODO(b/112046733): This test is broken. It should be fixed. +TEST_F(WvCdmEnginePreProvTestUatBinary, DISABLED_ProvisioningTest) { Provision(); } diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp index 83a2daac..349cec5c 100644 --- a/libwvdrmengine/cdm/core/test/test_base.cpp +++ b/libwvdrmengine/cdm/core/test/test_base.cpp @@ -203,8 +203,8 @@ class TestCryptoSessionFactory : public CryptoSessionFactory { void WvCdmTestBase::SetUp() { ::testing::Test::SetUp(); - Properties::Init(); Properties::set_provisioning_messages_are_binary(binary_provisioning_); + Properties::Init(); // Log the current test name, to help with debugging when the log and stdout // are not the same. const ::testing::TestInfo* const test_info =