Skip to content

Commit 49e473a

Browse files
Eugene Ostroukhovofrobots
Eugene Ostroukhov
authored andcommitted
test: fix failing inspector cctest
Test was updated to wait till the inspector processes socket closure. Fixes: #8006 PR-URL: #8019 Reviewed-By: ofrobots - Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
1 parent c628982 commit 49e473a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

test/cctest/test_inspector_socket.cc

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,11 @@ TEST_F(InspectorSocketTest, GetThenHandshake) {
731731
manual_inspector_socket_cleanup();
732732
}
733733

734-
static void WriteBeforeHandshake_close_cb(uv_handle_t* handle) {
735-
*(static_cast<bool *>(handle->data)) = true;
734+
static void WriteBeforeHandshake_inspector_delegate(inspector_handshake_event e,
735+
const std::string& path,
736+
bool* cont) {
737+
if (e == kInspectorHandshakeFailed)
738+
inspector_closed = 1;
736739
}
737740

738741
TEST_F(InspectorSocketTest, WriteBeforeHandshake) {
@@ -743,11 +746,10 @@ TEST_F(InspectorSocketTest, WriteBeforeHandshake) {
743746
inspector_write(&inspector, MESSAGE1, sizeof(MESSAGE1) - 1);
744747
inspector_write(&inspector, MESSAGE2, sizeof(MESSAGE2) - 1);
745748
expect_on_client(EXPECTED, sizeof(EXPECTED) - 1);
746-
bool flag = false;
747-
client_socket.data = &flag;
748-
uv_close(reinterpret_cast<uv_handle_t*>(&client_socket),
749-
WriteBeforeHandshake_close_cb);
750-
SPIN_WHILE(!flag);
749+
inspector_closed = 0;
750+
handshake_delegate = WriteBeforeHandshake_inspector_delegate;
751+
really_close(reinterpret_cast<uv_handle_t*>(&client_socket));
752+
SPIN_WHILE(inspector_closed == 0);
751753
}
752754

753755
static void CleanupSocketAfterEOF_close_cb(inspector_socket_t* inspector,

0 commit comments

Comments
 (0)