Merge branch 'master' into dan_latest

1 files changed, 15 insertions, 0 deletions

diff --git a/src/console/zmq/tests/test_etc.py b/src/console/zmq/tests/test_etc.py
new file mode 100755
index 00000000..ad224064
--- /dev/null
+++ b/src/console/zmq/tests/test_etc.py
@@ -0,0 +1,15 @@
+# Copyright (c) PyZMQ Developers.
+# Distributed under the terms of the Modified BSD License.
+
+import sys
+
+import zmq
+
+from . import skip_if
+
+@skip_if(zmq.zmq_version_info() < (4,1), "libzmq < 4.1")
+def test_has():
+    assert not zmq.has('something weird')
+    has_ipc = zmq.has('ipc')
+    not_windows = not sys.platform.startswith('win')
+    assert has_ipc == not_windows