Tweak tests

Author: shikokuchuo

src/proto.c

@@ -117,7 +117,7 @@ SEXP rnng_protocol_open(SEXP protocol, SEXP dial, SEXP listen, SEXP tls, SEXP au
   }
 
   if (xc)
-    goto fail;
+    goto failmem;
 
   PROTECT(socket = R_MakeExternalPtr(sock, nano_SocketSymbol, R_NilValue));
   R_RegisterCFinalizerEx(socket, socket_finalizer, TRUE);
@@ -144,9 +144,8 @@ SEXP rnng_protocol_open(SEXP protocol, SEXP dial, SEXP listen, SEXP tls, SEXP au
   UNPROTECT(1);
   return socket;
 
-  fail:
-  free(sock);
   failmem:
+  free(sock);
   ERROR_OUT(xc);
 
 }

src/sync.c

@@ -637,10 +637,10 @@ SEXP rnng_monitor_create(SEXP socket, SEXP cv) {
   nng_socket *sock = (nng_socket *) NANO_PTR(socket);
 
   if ((xc = nng_pipe_notify(*sock, NNG_PIPE_EV_ADD_POST, pipe_cb_monitor, monitor)))
-    goto fail;
+    goto failmem;
 
   if ((xc = nng_pipe_notify(*sock, NNG_PIPE_EV_REM_POST, pipe_cb_monitor, monitor)))
-    goto fail;
+    goto failmem;
 
   PROTECT(xptr = R_MakeExternalPtr(monitor, nano_MonitorSymbol, R_NilValue));
   R_RegisterCFinalizerEx(xptr, monitor_finalizer, TRUE);
@@ -650,7 +650,6 @@ SEXP rnng_monitor_create(SEXP socket, SEXP cv) {
 
   return xptr;
 
-  fail:
   failmem:
   if (monitor != NULL)
     free(monitor->ids);

tests/tests.R

@@ -481,7 +481,8 @@ test_error(stream(), "specify a URL")
 
 test_type("character", ver <- nng_version())
 test_equal(length(ver), 2L)
-test_equal(nng_error(8L), "8 | Try again")
+test_equal(nng_error(5L), "5 | Timed out")
+test_equal(nng_error(8), "8 | Try again")
 test_true(is_nul_byte(as.raw(0L)))
 test_true(!is_nul_byte(NULL))
 test_true(!is_error_value(1L))