From 1ab6872f82204e3f5a02e93d20746f37a56a3059 Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Mon, 14 Mar 2022 02:56:52 -0700
Subject: [PATCH] Fix EnsureProvisioned for double provisioning

[ Merge of http://go/vwvgerrit/147459 ]

Bug: 222355942
Bug: 166849552
Test: GtsMediaTestCases on sunfish
Change-Id: Ia14cad535425af814927b14df8f1ee839ac7dee2
---
 libwvdrmengine/cdm/core/test/test_base.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp
index e5b25465..c51eb908 100644
--- a/libwvdrmengine/cdm/core/test/test_base.cpp
+++ b/libwvdrmengine/cdm/core/test/test_base.cpp
@@ -123,10 +123,9 @@ void show_menu(const char* prog_name, const std::string& extra_help_text) {
             << std::endl;
 
   std::cout << "  --initial_time=<time>" << std::endl;
-  std::cout
-      << "    Set the initial time on the fake clock. This is ignored"
-      << "    if fake_sleep was not set." << std::endl
-      << std::endl;
+  std::cout << "    Set the initial time on the fake clock. This is ignored"
+            << "    if fake_sleep was not set." << std::endl
+            << std::endl;
 
   std::cout << "  --pass=<N>" << std::endl;
   std::cout << "    Run test pass N. This is used for reboot tests that "
@@ -448,7 +447,9 @@ void WvCdmTestBase::EnsureProvisioned() {
     Provision();
     status = cdm_engine.OpenSession(config_.key_system(), nullptr, nullptr,
                                     &session_id);
-
+    if (status == NEED_PROVISIONING) {
+      continue;
+    }
     ASSERT_EQ(NO_ERROR, status);
     status = cdm_engine.GenerateKeyRequest(session_id, key_set_id, init_data,
                                            kLicenseTypeStreaming,