Permalink
Browse files

test: remove bad tcp_write_error test

It makes the assumption that if you try to write to a localhost socket
often enough, eventually its send queue will fill up - which doesn't
happen if the machine it's running on is fast enough.
  • Loading branch information...
1 parent 768b524 commit 4cbd5c7b32095356ac7dd34beea7e09c430650fc @bnoordhuis bnoordhuis committed Jan 15, 2013
Showing with 0 additions and 172 deletions.
  1. +0 −2 test/test-list.h
  2. +0 −169 test/test-tcp-write-error.c
  3. +0 −1 uv.gyp
View
@@ -64,7 +64,6 @@ TEST_DECLARE (tcp_connect_timeout)
TEST_DECLARE (tcp_close_while_connecting)
TEST_DECLARE (tcp_close)
TEST_DECLARE (tcp_flags)
-TEST_DECLARE (tcp_write_error)
TEST_DECLARE (tcp_write_to_half_open_connection)
TEST_DECLARE (tcp_unexpected_read)
TEST_DECLARE (tcp_read_stop)
@@ -288,7 +287,6 @@ TASK_LIST_START
TEST_ENTRY (tcp_close_while_connecting)
TEST_ENTRY (tcp_close)
TEST_ENTRY (tcp_flags)
- TEST_ENTRY (tcp_write_error)
TEST_ENTRY (tcp_write_to_half_open_connection)
TEST_ENTRY (tcp_unexpected_read)
View
@@ -1,169 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "uv.h"
-#include "task.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static void connection_cb(uv_stream_t* server, int status);
-static void connect_cb(uv_connect_t* req, int status);
-static void write_cb(uv_write_t* req, int status);
-static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf);
-static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size);
-
-static uv_tcp_t tcp_server;
-static uv_tcp_t tcp_client;
-static uv_tcp_t tcp_peer; /* client socket as accept()-ed by server */
-static uv_connect_t connect_req;
-
-static int write_cb_called;
-static int write_cb_error_called;
-
-typedef struct {
- uv_write_t req;
- uv_buf_t buf;
-} write_req_t;
-
-
-static void connection_cb(uv_stream_t* server, int status) {
- int r;
-
- ASSERT(server == (uv_stream_t*)&tcp_server);
- ASSERT(status == 0);
-
- r = uv_tcp_init(server->loop, &tcp_peer);
- ASSERT(r == 0);
-
- r = uv_accept(server, (uv_stream_t*)&tcp_peer);
- ASSERT(r == 0);
-
- r = uv_read_start((uv_stream_t*)&tcp_peer, alloc_cb, read_cb);
- ASSERT(r == 0);
-}
-
-
-static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size) {
- static char slab[1024];
- return uv_buf_init(slab, sizeof slab);
-}
-
-
-static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) {
- uv_close((uv_handle_t*)&tcp_server, NULL);
- uv_close((uv_handle_t*)&tcp_peer, NULL);
-}
-
-
-static void connect_cb(uv_connect_t* req, int status) {
- uv_buf_t buf;
- size_t size;
- char* data;
- int r;
- write_req_t* wr;
-
- ASSERT(req == &connect_req);
- ASSERT(status == 0);
-
- while (1) {
- size = 10 * 1024 * 1024;
- data = malloc(size);
- ASSERT(data != NULL);
-
- memset(data, '$', size);
- buf = uv_buf_init(data, size);
-
- wr = (write_req_t*) malloc(sizeof *wr);
- wr->buf = buf;
- wr->req.data = data;
-
- r = uv_write(&(wr->req), req->handle, &wr->buf, 1, write_cb);
- ASSERT(r == 0);
-
- if (req->handle->write_queue_size >= size * 2) {
- break;
- }
- }
-}
-
-
-static void write_cb(uv_write_t* req, int status) {
- write_req_t* wr;
- wr = (write_req_t*) req;
-
- if (status == -1) {
- write_cb_error_called++;
- }
-
- if (req->handle->write_queue_size == 0) {
- uv_close((uv_handle_t*)&tcp_client, NULL);
- }
-
- free(wr->buf.base);
- free(wr);
-
- write_cb_called++;
-}
-
-
-/*
- * Assert that a failing write does not leave
- * the stream's write_queue_size in an inconsistent state.
- */
-TEST_IMPL(tcp_write_error) {
- uv_loop_t* loop;
- int r;
-
- loop = uv_default_loop();
- ASSERT(loop != NULL);
-
- r = uv_tcp_init(loop, &tcp_server);
- ASSERT(r == 0);
-
- r = uv_tcp_bind(&tcp_server, uv_ip4_addr("127.0.0.1", TEST_PORT));
- ASSERT(r == 0);
-
- r = uv_listen((uv_stream_t*)&tcp_server, 1, connection_cb);
- ASSERT(r == 0);
-
- r = uv_tcp_init(loop, &tcp_client);
- ASSERT(r == 0);
-
- r = uv_tcp_connect(&connect_req,
- &tcp_client,
- uv_ip4_addr("127.0.0.1", TEST_PORT),
- connect_cb);
- ASSERT(r == 0);
-
- ASSERT(write_cb_called == 0);
-
- r = uv_run(loop);
- ASSERT(r == 0);
-
- ASSERT(write_cb_called > 0);
- ASSERT(write_cb_error_called >= 1);
- ASSERT(tcp_client.write_queue_size == 0);
-
- MAKE_VALGRIND_HAPPY();
- return 0;
-}
View
1 uv.gyp
@@ -303,7 +303,6 @@
'test/test-tcp-connect-timeout.c',
'test/test-tcp-connect6-error.c',
'test/test-tcp-open.c',
- 'test/test-tcp-write-error.c',
'test/test-tcp-write-to-half-open-connection.c',
'test/test-tcp-writealot.c',
'test/test-tcp-unexpected-read.c',

0 comments on commit 4cbd5c7

Please sign in to comment.