1 files changed, 6 insertions, 15 deletions
diff --git a/deps/uv/test/test-tcp-bind-error.c b/deps/uv/test/test-tcp-bind-error.c
index 424953568e..2b2106ed5e 100644
--- a/deps/uv/test/test-tcp-bind-error.c
+++ b/deps/uv/test/test-tcp-bind-error.c
@@ -52,9 +52,7 @@ TEST_IMPL(tcp_bind_error_addrinuse) {
   r = uv_listen((uv_stream_t*)&server1, 128, NULL);
   ASSERT(r == 0);
   r = uv_listen((uv_stream_t*)&server2, 128, NULL);
-  ASSERT(r == -1);
-
-  ASSERT(uv_last_error(uv_default_loop()).code == UV_EADDRINUSE);
+  ASSERT(r == UV_EADDRINUSE);
 
   uv_close((uv_handle_t*)&server1, close_cb);
   uv_close((uv_handle_t*)&server2, close_cb);
@@ -75,12 +73,10 @@ TEST_IMPL(tcp_bind_error_addrnotavail_1) {
 
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
-  r = uv_tcp_bind(&server, addr);
 
   /* It seems that Linux is broken here - bind succeeds. */
-  if (r == -1) {
-    ASSERT(uv_last_error(uv_default_loop()).code == UV_EADDRNOTAVAIL);
-  }
+  r = uv_tcp_bind(&server, addr);
+  ASSERT(r == 0 || r == UV_EADDRNOTAVAIL);
 
   uv_close((uv_handle_t*)&server, close_cb);
 
@@ -101,8 +97,7 @@ TEST_IMPL(tcp_bind_error_addrnotavail_2) {
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, addr);
-  ASSERT(r == -1);
-  ASSERT(uv_last_error(uv_default_loop()).code == UV_EADDRNOTAVAIL);
+  ASSERT(r == UV_EADDRNOTAVAIL);
 
   uv_close((uv_handle_t*)&server, close_cb);
 
@@ -126,9 +121,7 @@ TEST_IMPL(tcp_bind_error_fault) {
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, *garbage_addr);
-  ASSERT(r == -1);
-
-  ASSERT(uv_last_error(uv_default_loop()).code == UV_EINVAL);
+  ASSERT(r == UV_EINVAL);
 
   uv_close((uv_handle_t*)&server, close_cb);
 
@@ -153,9 +146,7 @@ TEST_IMPL(tcp_bind_error_inval) {
   r = uv_tcp_bind(&server, addr1);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, addr2);
-  ASSERT(r == -1);
-
-  ASSERT(uv_last_error(uv_default_loop()).code == UV_EINVAL);
+  ASSERT(r == UV_EINVAL);
 
   uv_close((uv_handle_t*)&server, close_cb);