bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-03-30 20:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ceftests: More cleanup of TestHandler::OnTestTimeout

Browse Source
This commit is contained in:
Marshall Greenblatt 2023-10-23 11:17:50 -04:00
parent 6651523d86
commit 3476199bc5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/ceftests/test_handler.cc
View File

@ -444,6 +444,9 @@ void TestHandler::ExecuteTest() {
EXPECT_EQ(completion_state_->total(), 1); EXPECT_EQ(completion_state_->total(), 1);
// Reset any state from the previous run. // Reset any state from the previous run.
if (test_timeout_called_) {
test_timeout_called_ = false;
}
if (destroy_test_called_) { if (destroy_test_called_) {
destroy_test_called_ = false; destroy_test_called_ = false;
} }
@ -498,13 +501,15 @@ void TestHandler::OnTestTimeout(int timeout_ms, bool treat_as_error) {
EXPECT_FALSE(AllBrowsersClosed() && AllowTestCompletionWhenAllBrowsersClose()) EXPECT_FALSE(AllBrowsersClosed() && AllowTestCompletionWhenAllBrowsersClose())
<< "Test timed out unexpectedly; should be complete"; << "Test timed out unexpectedly; should be complete";
// Keep |this| alive until after the method completes.
CefRefPtr<TestHandler> self(this);
// Close any remaining browsers. // Close any remaining browsers.
DestroyTest(); DestroyTest();
// Reset signal completion count. // Reset signal completion count.
if (signal_completion_count_ > 0) { if (signal_completion_count_ > 0) {
signal_completion_count_ = 0; signal_completion_count_ = 0;
// May result in |this| being deleted.
MaybeTestComplete(); MaybeTestComplete();
} }
} }