commit 5cfbc92dbc3972c793e9c793b7dd4977a63f5faf
author Michael Schwartz <schwartzmi@google.com> Mon May 08 14:06:49 2017 -0700
committer Michael Schwartz <schwartzmi@google.com> Tue May 09 20:25:36 2017 -0700
tree 57bb768e4b208f00b8d91bb3d2865a5ea0c4d6b7
parent 3477f0479f1075d9812ac20188e096510f171db8

Improve error message for AVB failures

Bug: 38131335
Test: `m -j libvintf_test` and run test.
Change-Id: I952da9d08cfb0e16855bf63167e6067716abe777

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 1c7c88d..0903f7d 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -613,6 +613,7 @@
     {
         setAvb(badAvb, {1, 0}, {2, 1});
         EXPECT_FALSE(badAvb.checkCompatibility(cm, &error));
+        EXPECT_STREQ(error.c_str(), "Vbmeta version 1.0 does not match framework matrix 2.1");
     }
     {
         setAvb(badAvb, {2, 1}, {3, 0});
@@ -880,6 +881,9 @@
             [&](auto) { return &devManifest; },
             runtimeInfoFunc,
             &error)) << error;
+    EXPECT_STREQ(error.c_str(),
+                 "Runtime info and framework compatibility matrix are incompatible: "
+                 "AVB version 2.1 does not match framework matrix 2.2");
     EXPECT_FALSE(systemMounted);
     EXPECT_TRUE(vendorMounted);
     EXPECT_FALSE(systemUmounted);