Skip to content

Commit c2727df

Browse files
committed
fix chromium tracing test
1 parent ae4a620 commit c2727df

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,19 @@ void shouldRunWithCustomCategoriesIfProvided(@TempDir Path tempDir) throws IOExc
6464
browser.startTracing(page, new Browser.StartTracingOptions()
6565
.setPath(outputTraceFile)
6666
.setCategories(asList("disabled-by-default-v8.cpu_profiler.hires")));
67+
page.evaluate("() => 1 + 1");
6768
browser.stopTracing();
6869
try (FileReader fileReader = new FileReader(outputTraceFile.toFile())) {
6970
JsonObject traceJson = new Gson().fromJson(fileReader, JsonObject.class);
70-
assertTrue(traceJson.getAsJsonObject("metadata").get("trace-config")
71-
.getAsString().contains("disabled-by-default-v8.cpu_profiler.hires"));
71+
// NOTE: trace-config is deprecated as per http://crrev.com/c/6628182
72+
boolean hasTraceConfig = traceJson.getAsJsonObject("metadata").get("trace-config").getAsString().contains("disabled-by-default-v8.cpu_profiler.hires");
73+
boolean hasTraceEvents = traceJson.getAsJsonArray("traceEvents").asList().stream()
74+
.anyMatch(event -> {
75+
JsonObject eventObj = (JsonObject) event;
76+
return eventObj.has("cat") &&
77+
eventObj.get("cat").getAsString().equals("disabled-by-default-v8.cpu_profiler.hires");
78+
});
79+
assertTrue(hasTraceConfig || hasTraceEvents);
7280
}
7381
}
7482
}

0 commit comments

Comments
 (0)