summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 23:08:49 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 23:08:49 +0000
commitb2776001d48b85076ebb7cc1df49c749ec9b524c (patch)
treeb43c6b4e6d517c02098c20e9730e638052b63aba /net/spdy
parent9115e087bd27c51cabda7e04f318f06e932cba1b (diff)
downloadchromium_src-b2776001d48b85076ebb7cc1df49c749ec9b524c.zip
chromium_src-b2776001d48b85076ebb7cc1df49c749ec9b524c.tar.gz
chromium_src-b2776001d48b85076ebb7cc1df49c749ec9b524c.tar.bz2
Not sure how to disable TEST_P tests :-/
Revert 59168 - Disable SpdyNetworkTransactionTest.WriteError on Mac as it's crashing. BUG=55174 TEST=SpdyNetworkTransactionTest.WriteError Review URL: http://codereview.chromium.org/3315022 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/3350019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_network_transaction_unittest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index f922b8d..ea34b72 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -3098,15 +3098,8 @@ TEST_P(SpdyNetworkTransactionTest, DISABLED_CorruptFrameSessionError) {
}
}
-// Crashes on Mac, see http://crbug.com/55174
-#if defined(OS_MACOSX)
-#define MAYBE_WriteError DISABLED_WriteError
-#else
-#define MAYBE_WriteError WriteError
-#endif // defined(OS_MACOSX)
-
// Test that we shutdown correctly on write errors.
-TEST_P(SpdyNetworkTransactionTest, MAYBE_WriteError) {
+TEST_P(SpdyNetworkTransactionTest, WriteError) {
scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
MockWrite writes[] = {
// We'll write 10 bytes successfully