diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-25 19:09:50 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-25 19:09:50 +0000 |
| commit | 09509b6859dcb32e85710a6eb9ed635e0f4914ac (patch) | |
| tree | 09479357ef8229ac8f7c3e1de419999ac9ab991b | |
| parent | b28c794ec1a90b8bbae2420b17a45365b4f9f684 (diff) | |
| parent | 679fe5c7eef9347c884fa768f34b982c3258bcff (diff) | |
| download | Gki-09509b6859dcb32e85710a6eb9ed635e0f4914ac.tar.gz | |
Snap for 7236715 from 679fe5c7eef9347c884fa768f34b982c3258bcff to sdk-releaseplatform-tools-31.0.2
Change-Id: I12eab804f74b0352805634866566d6f3e04d3d00
| -rw-r--r-- | test/src/com/android/gki/tests/GkiInstallTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ public class GkiInstallTest extends BaseHostJUnit4Test { "--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; } |