Prepare Upgrade to libzmq 4.2.0

lgeiger · lgeiger · commit c4028c2bdea9 · 2016-11-04T11:51:46.000+01:00
diff --git a/binding.cc b/binding.cc
@@ -26,7 +26,9 @@
 #include <node_version.h>
 #include <node_buffer.h>
 #include <zmq.h>
+#if (ZMQ_VERSION < 40200)
 #include <zmq_utils.h>
+#endif
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/test/socket.router.js b/test/socket.router.js
@@ -21,10 +21,11 @@ describe('socket.router', function(){
     var errMsgs = require('os').platform() === 'win32' ? ['Unknown error'] : [];
     errMsgs.push('No route to host');
     errMsgs.push('Resource temporarily unavailable');
+    errMsgs.push('Host unreachable');
 
     function assertRouteError(err) {
       if (errMsgs.indexOf(err.message) === -1) {
-        throw new Error('Bad error');
+        throw new Error(err.message);
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,11 @@ describe('socket.router', function(){`
`21`	`21`	`var errMsgs = require('os').platform() === 'win32' ? ['Unknown error'] : [];`
`22`	`22`	`errMsgs.push('No route to host');`
`23`	`23`	`errMsgs.push('Resource temporarily unavailable');`
	`24`	`+ errMsgs.push('Host unreachable');`
`24`	`25`
`25`	`26`	`function assertRouteError(err) {`
`26`	`27`	`if (errMsgs.indexOf(err.message) === -1) {`
`27`		`- throw new Error('Bad error');`
	`28`	`+ throw new Error(err.message);`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`