wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1252163: Fix CheckTcpConnectivity to wait for readable/writeable when necessary. r=drno

Browse Source 
MozReview-Commit-ID: 6hz0eCghYE0
This commit is contained in:
Byron Campen [:bwc] 2016-02-29 12:33:47 -06:00
parent 9dc39a7bfd
commit a260b924eb
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
media/mtransport/test/test_nr_socket_unittest.cpp
View File

@ -204,7 +204,7 @@ class TestNrSocketTest : public MtransportTest {
// write on |from|, recv on |accepted_sock|
if (!WaitForWriteable(from)) {
std::cerr << __LINE__ << "WaitForWriteable failed" << std::endl;
std::cerr << __LINE__ << "WaitForWriteable (1) failed" << std::endl;
return false;
}
@ -219,6 +219,11 @@ class TestNrSocketTest : public MtransportTest {
return false;
}
if (!WaitForReadable(accepted_sock)) {
std::cerr << __LINE__ << "WaitForReadable (1) failed" << std::endl;
return false;
}
sts_->Dispatch(WrapRunnableRet(&r,
this,
&TestNrSocketTest::RecvDataTcp_s,
@ -229,6 +234,11 @@ class TestNrSocketTest : public MtransportTest {
return false;
}
if (!WaitForWriteable(accepted_sock)) {
std::cerr << __LINE__ << "WaitForWriteable (2) failed" << std::endl;
return false;
}
sts_->Dispatch(WrapRunnableRet(&r,
this,
&TestNrSocketTest::SendDataTcp_s,
@ -239,6 +249,11 @@ class TestNrSocketTest : public MtransportTest {
return false;
}
if (!WaitForReadable(from)) {
std::cerr << __LINE__ << "WaitForReadable (2) failed" << std::endl;
return false;
}
sts_->Dispatch(WrapRunnableRet(&r,
this,
&TestNrSocketTest::RecvDataTcp_s,
@ -390,7 +405,7 @@ class TestNrSocketTest : public MtransportTest {
}
bool WaitForSocketState(TestNrSocket *sock, int state) {
bool WaitForSocketState(NrSocketBase *sock, int state) {
MOZ_ASSERT(sock);
sts_->Dispatch(WrapRunnable(this,
&TestNrSocketTest::WaitForSocketState_s,
@ -413,19 +428,19 @@ class TestNrSocketTest : public MtransportTest {
return res;
}
void WaitForSocketState_s(TestNrSocket *sock, int state) {
void WaitForSocketState_s(NrSocketBase *sock, int state) {
NR_ASYNC_WAIT(sock, state, &WaitDone, this);
}
void CancelWait_s(TestNrSocket *sock, int state) {
void CancelWait_s(NrSocketBase *sock, int state) {
sock->cancel(state);
}
bool WaitForReadable(TestNrSocket *sock) {
bool WaitForReadable(NrSocketBase *sock) {
return WaitForSocketState(sock, NR_ASYNC_WAIT_READ);
}
bool WaitForWriteable(TestNrSocket *sock) {
bool WaitForWriteable(NrSocketBase *sock) {
return WaitForSocketState(sock, NR_ASYNC_WAIT_WRITE);
}