Merge commit 'd9b2833e272fa1018058786edef45a42cbe4ecc0' into pullstream
This commit is contained in:
commit
4ab992ed31
@ -136,7 +136,11 @@ int TestRequest1()
|
|||||||
auto res = cUrlClient::Get("http://github.com", std::move(callbacks), AStringMap(), AString(), std::move(options));
|
auto res = cUrlClient::Get("http://github.com", std::move(callbacks), AStringMap(), AString(), std::move(options));
|
||||||
if (res.first)
|
if (res.first)
|
||||||
{
|
{
|
||||||
evtFinished->Wait();
|
if (!evtFinished->Wait(10000))
|
||||||
|
{
|
||||||
|
LOG("Aborting the wait for response; failing the test.");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -158,7 +162,11 @@ int TestRequest2()
|
|||||||
auto res = cUrlClient::Get("http://github.com", std::move(callbacks));
|
auto res = cUrlClient::Get("http://github.com", std::move(callbacks));
|
||||||
if (res.first)
|
if (res.first)
|
||||||
{
|
{
|
||||||
evtFinished->Wait();
|
if (!evtFinished->Wait(10000))
|
||||||
|
{
|
||||||
|
LOG("Aborting the wait for response; failing the test.");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -182,7 +190,11 @@ int TestRequest3()
|
|||||||
auto res = cUrlClient::Get("https://github.com", std::move(callbacks), AStringMap(), AString(), std::move(options));
|
auto res = cUrlClient::Get("https://github.com", std::move(callbacks), AStringMap(), AString(), std::move(options));
|
||||||
if (res.first)
|
if (res.first)
|
||||||
{
|
{
|
||||||
evtFinished->Wait();
|
if (!evtFinished->Wait(10000))
|
||||||
|
{
|
||||||
|
LOG("Aborting the wait for response; failing the test.");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -204,7 +216,11 @@ int TestRequest4()
|
|||||||
auto res = cUrlClient::Get("https://github.com", std::move(callbacks));
|
auto res = cUrlClient::Get("https://github.com", std::move(callbacks));
|
||||||
if (res.first)
|
if (res.first)
|
||||||
{
|
{
|
||||||
evtFinished->Wait();
|
if (!evtFinished->Wait(10000))
|
||||||
|
{
|
||||||
|
LOG("Aborting the wait for response; failing the test.");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user