Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a295f21 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh
Browse files

Ignore 'cmd font clear' failure in tearDown(). 

This would fail (as expected) on Pixel 3 / 3a.
On Pixel 3 / 3a, we skip the test in assumeTrue() in setUp(). tearDown()
should not throw and make the test fail.

Bug: 187364676
Test: forrest
Change-Id: I9e82c2e27c3ef71e73bf022db543318cfc0f2ef7
parent a759abbe

tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ public class UpdatableSystemFontTest { 


    @After

    public void tearDown() throws Exception {

        expectCommandToSucceed("cmd font clear");

        // Ignore errors because this may fail if updatable system font is not enabled.

        runShellCommand("cmd font clear", null);

        if (mKeyId != null) {

            expectCommandToSucceed("mini-keyctl unlink " + mKeyId + " .fs-verity");

        }