bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Fix flaky FrameHandlerTest.Order* tests (fixes #3817) 

The OnFrameAttached callback relies on a round-trip to the
renderer process and may not be synchronized with OnLoadStart/
OnLoadEnd/OnMainFrameChanged callbacks.
This commit is contained in:
Marshall Greenblatt 2024-11-11 14:40:42 -05:00
parent 1a99a3abc5
commit e0817536a5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/ceftests/frame_handler_unittest.cc
View File

@ -392,10 +392,22 @@ struct FrameStatus {
for (int i = 0; i <= CALLBACK_LAST; ++i) { for (int i = 0; i <= CALLBACK_LAST; ++i) {
if (i < current_callback && IsExpectedCallback(i)) { if (i < current_callback && IsExpectedCallback(i)) {
if (i == FRAME_ATTACHED &&
(current_callback == MAIN_FRAME_CHANGED_ASSIGNED ||
current_callback == LOAD_START || current_callback == LOAD_END)) {
// Timing of OnFrameAttached is flaky. See issue #3817.
continue;
}
EXPECT_TRUE(got_callback_[i]) EXPECT_TRUE(got_callback_[i])
<< "inside " << func << " should already have gotten " << "inside " << func << " should already have gotten "
<< GetCallbackName(i); << GetCallbackName(i);
} else { } else {
if (current_callback == FRAME_ATTACHED &&
(i == MAIN_FRAME_CHANGED_ASSIGNED || i == LOAD_START ||
i == LOAD_END)) {
// Timing of OnFrameAttached is flaky. See issue #3817.
continue;
}
EXPECT_FALSE(got_callback_[i]) EXPECT_FALSE(got_callback_[i])
<< "inside " << func << " should not already have gotten " << "inside " << func << " should not already have gotten "
<< GetCallbackName(i); << GetCallbackName(i);