Skip to content

Commit

Permalink
Fix UNIX pipe connect error reporting, add test
Browse files Browse the repository at this point in the history
  • Loading branch information
ry committed Nov 3, 2011
1 parent ee8a681 commit 0698e3f
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/unix/pipe.c
Expand Up @@ -209,7 +209,7 @@ int uv_pipe_connect(uv_connect_t* req,
while (r == -1 && errno == EINTR);

if (r == -1) {
uv__set_sys_error(handle->loop, errno);
status = errno;
uv__close(sockfd);
goto out;
}
Expand Down
3 changes: 3 additions & 0 deletions test/test-list.h
Expand Up @@ -55,6 +55,7 @@ TEST_DECLARE (pipe_bind_error_addrinuse)
TEST_DECLARE (pipe_bind_error_addrnotavail)
TEST_DECLARE (pipe_bind_error_inval)
TEST_DECLARE (pipe_listen_without_bind)
TEST_DECLARE (pipe_connect_bad_name)
TEST_DECLARE (connection_fail)
TEST_DECLARE (connection_fail_doesnt_auto_close)
TEST_DECLARE (shutdown_eof)
Expand Down Expand Up @@ -124,6 +125,8 @@ HELPER_DECLARE (pipe_echo_server)


TASK_LIST_START
TEST_ENTRY (pipe_connect_bad_name)

TEST_ENTRY (tty)
TEST_ENTRY (stdio_over_pipes)
TEST_ENTRY (ipc_listen_before_write)
Expand Down
69 changes: 69 additions & 0 deletions test/test-pipe-connect-error.c
@@ -0,0 +1,69 @@
/* 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>


#ifdef _WIN32
# define BAD_PIPENAME "bad-pipe"
#else
# define BAD_PIPENAME "/path/to/unix/socket/that/really/should/not/be/there"
#endif


static int close_cb_called = 0;
static int connect_cb_called = 0;


static void close_cb(uv_handle_t* handle) {
ASSERT(handle != NULL);
close_cb_called++;
}


static void connect_cb(uv_connect_t* connect_req, int status) {
ASSERT(status == -1);
ASSERT(uv_last_error(uv_default_loop()).code == UV_ENOENT);
uv_close((uv_handle_t*)connect_req->handle, close_cb);
connect_cb_called++;
}


TEST_IMPL(pipe_connect_bad_name) {
uv_pipe_t client;
uv_connect_t req;
int r;

r = uv_pipe_init(uv_default_loop(), &client, 0);
ASSERT(r == 0);
uv_pipe_connect(&req, &client, BAD_PIPENAME, connect_cb);
ASSERT(r == 0);

uv_run(uv_default_loop());

ASSERT(close_cb_called == 1);
ASSERT(connect_cb_called == 1);

return 0;
}
1 change: 1 addition & 0 deletions uv.gyp
Expand Up @@ -296,6 +296,7 @@
'test/test-pass-always.c',
'test/test-ping-pong.c',
'test/test-pipe-bind-error.c',
'test/test-pipe-connect-error.c',
'test/test-ref.c',
'test/test-shutdown-eof.c',
'test/test-spawn.c',
Expand Down

0 comments on commit 0698e3f

Please sign in to comment.