Enabling some tests which pass now

Ognjen Sobajic · Ognjen Sobajic · commit 894f53f9ca00 · 2013-07-28T23:48:36.000-07:00
diff --git a/Release/tests/Functional/http/client/connections_and_errors.cpp b/Release/tests/Functional/http/client/connections_and_errors.cpp
@@ -122,7 +122,10 @@ TEST_FIXTURE(uri_address, server_close_without_responding,
     VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).wait(), std::errc::host_unreachable);
 }
 
+<<<<<<< HEAD
 // This test hangs or crashes intermittently on Linux
+=======
+>>>>>>> d6fa40eca4908abacf667b3865e894f393a15c4f
 TEST_FIXTURE(uri_address, request_timeout)
 {
     test_http_server::scoped_server scoped(m_uri);
diff --git a/Release/tests/Functional/http/client/progress_handler_tests.cpp b/Release/tests/Functional/http/client/progress_handler_tests.cpp
@@ -272,8 +272,7 @@ TEST_FIXTURE(uri_address, set_progress_handler_open_failure)
     VERIFY_ARE_EQUAL(0, calls);
 }
 
-// This test hangs or crashes intermittently on Linux
-TEST_FIXTURE(uri_address, set_progress_handler_request_timeout, "Ignore:Linux", "TFS#612139")
+TEST_FIXTURE(uri_address, set_progress_handler_request_timeout)
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client_config config;

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,10 @@ TEST_FIXTURE(uri_address, server_close_without_responding,`
`122`	`122`	`VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).wait(), std::errc::host_unreachable);`
`123`	`123`	`}`
`124`	`124`
	`125`	`+<<<<<<< HEAD`
`125`	`126`	`// This test hangs or crashes intermittently on Linux`
	`127`	`+=======`
	`128`	`+>>>>>>> d6fa40eca4908abacf667b3865e894f393a15c4f`
`126`	`129`	`TEST_FIXTURE(uri_address, request_timeout)`
`127`	`130`	`{`
`128`	`131`	`test_http_server::scoped_server scoped(m_uri);`
Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,7 @@ TEST_FIXTURE(uri_address, set_progress_handler_open_failure)`
`272`	`272`	`VERIFY_ARE_EQUAL(0, calls);`
`273`	`273`	`}`
`274`	`274`
`275`		`-// This test hangs or crashes intermittently on Linux`
`276`		`-TEST_FIXTURE(uri_address, set_progress_handler_request_timeout, "Ignore:Linux", "TFS#612139")`
	`275`	`+TEST_FIXTURE(uri_address, set_progress_handler_request_timeout)`
`277`	`276`	`{`
`278`	`277`	`test_http_server::scoped_server scoped(m_uri);`
`279`	`278`	`http_client_config config;`