diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-04 04:30:25 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-04 04:30:25 +0000 |
| commit | ee0b101483ec982ca5abb03208ce3fa5ac057a3e (patch) | |
| tree | 9b9d285f6b93298fc25679c81690566da67adaf2 /net | |
| parent | 7624fa1390e676ce99e6cac3761438a67ba6d2fc (diff) | |
| download | chromium_src-ee0b101483ec982ca5abb03208ce3fa5ac057a3e.zip chromium_src-ee0b101483ec982ca5abb03208ce3fa5ac057a3e.tar.gz chromium_src-ee0b101483ec982ca5abb03208ce3fa5ac057a3e.tar.bz2 | |
mark SOCKS4_HTTP_GET and SOCKS4_SSL_GET as flaky on mac.
BUG=112682
TEST=none
TBR=satorux
Review URL: http://codereview.chromium.org/9325050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 5a75e8d..75b6a98 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -5356,7 +5356,13 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { EXPECT_EQ(OK, rv); } -TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) { +#if defined(OS_MACOSX) +#define MAYBE_SOCKS4_HTTP_GET FLAKY_SOCKS4_HTTP_GET +#else +#define MAYBE_SOCKS4_HTTP_GET SOCKS4_HTTP_GET +#endif + +TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_HTTP_GET) { HttpRequestInfo request; request.method = "GET"; request.url = GURL("http://www.google.com/"); @@ -5407,7 +5413,13 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) { EXPECT_EQ("Payload", response_text); } -TEST_F(HttpNetworkTransactionTest, SOCKS4_SSL_GET) { +#if defined(OS_MACOSX) +#define MAYBE_SOCKS4_SSL_GET FLAKY_SOCKS4_SSL_GET +#else +#define MAYBE_SOCKS4_SSL_GET SOCKS4_SSL_GET +#endif + +TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_SSL_GET) { HttpRequestInfo request; request.method = "GET"; request.url = GURL("https://www.google.com/"); |