commit 679fe5c7eef9347c884fa768f34b982c3258bcff
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 25 03:53:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 25 03:53:54 2021 +0000
tree 09479357ef8229ac8f7c3e1de419999ac9ab991b
parent 0ccdbe6bc010ed6cc085b89d125851557566b687
parent f51fe2fa61c2183664d79336fdc163e76c78f029

Merge "Fix the error string of the downgrade error"

test/src/com/android/gki/tests/GkiInstallTest.java

diff --git a/test/src/com/android/gki/tests/GkiInstallTest.java b/test/src/com/android/gki/tests/GkiInstallTest.java
index 9abc5f9..8ca5272 100644
--- a/test/src/com/android/gki/tests/GkiInstallTest.java
+++ b/test/src/com/android/gki/tests/GkiInstallTest.java
@@ -17,6 +17,7 @@
 package com.android.gki.tests;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.either;
 import static org.hamcrest.Matchers.everyItem;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasItem;
@@ -167,8 +168,8 @@
                 "--staged-ready-timeout", String.valueOf(INSTALL_TIMEOUT_MS));
         if (!mExpectInstallSuccess) {
             assertNotNull("Should not be able to install downgrade package", result);
-            assertThat(result, containsString("Downgrade of APEX package " + mPackageName +
-                    " is not allowed."));
+            assertThat(result, either(containsString("Downgrade of APEX package " + mPackageName
+                    + " is not allowed.")).or(containsString("INSTALL_FAILED_VERSION_DOWNGRADE")));
             return;
         }