startop: Fix a bug in iorap functional test.

The prefetching work runs on another process.
Grep everything to workaround it.

Bug: 137403231
Test: atest iorap-functional-tests
Change-Id: Iac1796cb22f0db83ac5ebd78cb40e5cc5ac3a930
(cherry picked from commit 7d76f014eb)
This commit is contained in:
Yan Wang
2020-02-19 09:43:46 -08:00
committed by Igor Murashkin
parent a52f95e589
commit 6411a3353d

View File

@@ -70,7 +70,7 @@ public class IorapWorkFlowTest {
private static final Duration TIMEOUT = Duration.ofSeconds(300L);
private static final String READAHEAD_INDICATOR =
"Description = /data/misc/iorapd/com.android.settings/none/com.android.settings.Settings/compiled_traces/compiled_trace.pb";
"Description = /data/misc/iorapd/com.android.settings/-?\\d+/com.android.settings.Settings/compiled_traces/compiled_trace.pb";
private UiDevice mDevice;
@@ -326,14 +326,14 @@ public class IorapWorkFlowTest {
return false;
}
String log = executeShellCommand("logcat -s iorapd -d");
String log = executeShellCommand("logcat -d");
Pattern p = Pattern.compile(
".*" + READAHEAD_INDICATOR
+ ".*Total File Paths=(\\d+) \\(good: (\\d+)%\\)\n"
+ ".*Total Entries=(\\d+) \\(good: (\\d+)%\\)\n"
+ ".*Total Bytes=(\\d+) \\(good: (\\d+)%\\).*",
Pattern.DOTALL);
".*" + READAHEAD_INDICATOR
+ ".*Total File Paths=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n"
+ ".*Total Entries=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n"
+ ".*Total Bytes=(\\d+) \\(good: (\\d+[.]?\\d*)%\\).*",
Pattern.DOTALL);
Matcher m = p.matcher(log);
if (!m.matches()) {