Updating http_client outside tests to deal with timeouts from IXmlHttpRequest2.

stgates · stgates · commit ce2baff68c37 · 2015-03-02T18:54:32.000-08:00
diff --git a/Release/tests/functional/http/client/outside_tests.cpp b/Release/tests/functional/http/client/outside_tests.cpp
@@ -48,7 +48,8 @@ SUITE(outside_tests)
 // helper function to check if failure is due to timeout.
 bool is_timeout(const std::string &msg)
 {
-    if (msg.find("The operation timed out") != std::string::npos)
+    if (msg.find("The operation timed out") != std::string::npos /* WinHTTP */ ||
+        msg.find("The operation was timed out") != std::string:npos /* IXmlHttpRequest2 */)
     {
         return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ SUITE(outside_tests)`
`48`	`48`	`// helper function to check if failure is due to timeout.`
`49`	`49`	`bool is_timeout(const std::string &msg)`
`50`	`50`	`{`
`51`		`- if (msg.find("The operation timed out") != std::string::npos)`
	`51`	`+ if (msg.find("The operation timed out") != std::string::npos /* WinHTTP */ \|\|`
	`52`	`+ msg.find("The operation was timed out") != std::string:npos /* IXmlHttpRequest2 */)`
`52`	`53`	`{`
`53`	`54`	`return true;`
`54`	`55`	`}`