Source release 18.5.0

core/test/test_base.cpp

@@ -330,6 +330,12 @@ void WvCdmTestBase::Provision() {
 }
 
 void WvCdmTestBase::EnsureProvisioned() {
+  // TODO: b/305093063 - Remove when Drm Reprovisioning server is implemented.
+  if (wvoec::global_features.provisioning_method ==
+      OEMCrypto_DrmReprovisioning) {
+    GTEST_SKIP()
+        << "Skipping until Drm Reprovisioning server support is implemented.";
+  }
   CdmSessionId session_id;
   std::unique_ptr<wvutil::FileSystem> file_system(CreateTestFileSystem());
   // OpenSession will check if a DRM certificate exists, while