From dd70d63b7669a917eb46117598605806a4b91e28 Mon Sep 17 00:00:00 2001 From: Alex Dale Date: Mon, 18 May 2020 11:38:06 -0700 Subject: [PATCH] Rolled expected version number for R. [ Merge of http://go/wvgerrit/100403 ] VersionNumberTest.VersionNumberChangeCanary was expecting a version string of "R". However, Android rvc branch is now far enough into development to use a numbered version: version "11". Bug: 156853733 Test: Android license request test Change-Id: I63d33f742c849b672b2d2402ab8423fdf2450f6f --- libwvdrmengine/cdm/test/request_license_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index a9809ce2..f3c562af 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -5652,7 +5652,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) { android::base::GetProperty("ro.build.version.release", ""); ASSERT_TRUE(release_number.size() > 0); // Reminder to change the Widevine CDM version number. - EXPECT_STREQ("R", release_number.c_str()) + EXPECT_STREQ("11", release_number.c_str()) << "The Android version number has changed. You need to update this test " "and also possibly update the Widevine version number in " "wv_android_constants.h";