Quit test WithClientId early

Merge from Widevine repo of http://go/wvgerrit/41784

To avoid a seg fault, WithClientId will quit as soon as we find
usage_info is empty.

test: run unit tests (with no wifi to force failure)
bug: 72457799

Change-Id: I250538e750e14ed5780572a69360c8ec304e2554
This commit is contained in:
Fred Gylys-Colwell
2018-01-24 15:52:31 -08:00
parent e008a1e5d8
commit 80a70c2dfb
2 changed files with 4 additions and 2 deletions

View File

@@ -2501,7 +2501,9 @@ TEST_P(WvCdmUsageTest, WithClientId) {
CdmUsageInfoReleaseMessage release_msg;
CdmResponseType status = decryptor_.GetUsageInfo(
app_id, kDefaultCdmIdentifier, &usage_info);
EXPECT_EQ(usage_info.empty() ? NO_ERROR : KEY_MESSAGE, status);
EXPECT_EQ(KEY_MESSAGE, status);
ASSERT_FALSE(usage_info.empty());
// Validate signed renewal request
EXPECT_TRUE(signed_message.ParseFromString(usage_info[0]))

View File

@@ -26,7 +26,7 @@ adb_shell_run() {
echo "or begin execution by running ./build_and_run_all_unit_tests.sh"
exit 1
fi
echo $test_file
echo "------ Starting: $test_file"
local tmp_log="$OUT/mediadrmtest.log"
local adb_error="[ADB SHELL] $@ $test_file failed"
adb shell "GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log"