Skip to content

inspector: Fix failing test #8019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eugeneo wants to merge 1 commit into from
Closed

inspector: Fix failing test #8019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
test: Fix failing inspector cctest 
Test was updated to wait till the inspector processes socket closure.

Fixes: #8006
  • Loading branch information
Eugene Ostroukhov committed Aug 9, 2016
commit 4488a4f0d30e880342b1bc0b21991d30eab464bb
16 changes: 9 additions & 7 deletions test/cctest/test_inspector_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,11 @@ TEST_F(InspectorSocketTest, GetThenHandshake) {
manual_inspector_socket_cleanup();
}

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

TEST_F(InspectorSocketTest, WriteBeforeHandshake) {
Expand All @@ -743,11 +746,10 @@ TEST_F(InspectorSocketTest, WriteBeforeHandshake) {
inspector_write(&inspector, MESSAGE1, sizeof(MESSAGE1) - 1);
inspector_write(&inspector, MESSAGE2, sizeof(MESSAGE2) - 1);
expect_on_client(EXPECTED, sizeof(EXPECTED) - 1);
bool flag = false;
client_socket.data = &flag;
uv_close(reinterpret_cast<uv_handle_t*>(&client_socket),
WriteBeforeHandshake_close_cb);
SPIN_WHILE(!flag);
inspector_closed = 0;
handshake_delegate = WriteBeforeHandshake_inspector_delegate;
really_close(reinterpret_cast<uv_handle_t*>(&client_socket));
SPIN_WHILE(inspector_closed == 0);
}

static void CleanupSocketAfterEOF_close_cb(inspector_socket_t* inspector,
Expand Down