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

Commit 4aafe443 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Wait for the profile to not be empty in BootImageProfileTest 

Keep trying to force profile saves until it's not empty. This handles
the case when the system server isn't started enough to save a profile
yet. This can be affected by boot time fluctuations if we don't wait.

Test: atest BootImageProfileTest
Bug: 139883463

Change-Id: I98b359412f919bd64c2cd2a5b7d6659d1cef113d
parent 6c5f83aa

tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java

+11 −3
Original line number Diff line number Diff line
@@ -66,10 +66,18 @@ public class BootImageProfileTest implements IDeviceTest { 
        String res;

        res = mTestDevice.executeShellCommand("truncate -s 0 " + SYSTEM_SERVER_PROFILE).trim();

        assertTrue(res, res.length() == 0);

        // Force save profiles in case the system just started.

        Thread.sleep(1000);

        // Wait up to 20 seconds for the profile to be saved.

        for (int i = 0; i < 20; ++i) {

            // Force save the profile since we truncated it.

            forceSaveProfile("system_server");

        Thread.sleep(2000);

            String s = mTestDevice.executeShellCommand("wc -c <" + SYSTEM_SERVER_PROFILE).trim();

            if (!"0".equals(s)) {

                break;

            }

            Thread.sleep(1000);

        }

        // In case the profile is partially saved, wait an extra second.

        Thread.sleep(1000);

        // Validate that the profile is non empty.

        res = mTestDevice.executeShellCommand("profman --dump-only --profile-file="

                + SYSTEM_SERVER_PROFILE);