Improve bind_addr storing code @ server.HTTPServer

Fixes #81

CHANGES.rst

@@ -1,3 +1,12 @@
+v6.1.2
+======
+
+- :issue:`81`: Fix regression introduced by :pr:`80`.
+
+  * Restore :py:attr:`storing bound socket
+    <cheroot.server.HTTPServer.bind_addr>` in Windows broken by use of
+    :py:obj:`socket.AF_UNIX`
+
 v6.1.1
 ======
 

cheroot/server.py

@@ -72,7 +72,7 @@
            'Gateway', 'get_ssl_adapter_class')
 
 
-if 'win' in sys.platform and hasattr(socket, 'AF_INET6'):
+if platform.system() == 'Windows' and hasattr(socket, 'AF_INET6'):
     if not hasattr(socket, 'IPPROTO_IPV6'):
         socket.IPPROTO_IPV6 = 41
     if not hasattr(socket, 'IPV6_V6ONLY'):
@@ -1610,7 +1610,11 @@ def bind(self, family, type, proto=0):
         # TODO: keep requested bind_addr separate real bound_addr (port is
         # different in case of ephemeral port 0)
         self.bind_addr = self.socket.getsockname()
-        if family != socket.AF_UNIX:
+        if family in (
+            # Windows doesn't have socket.AF_UNIX, so not using it in check
+            socket.AF_INET,
+            socket.AF_INET6,
+        ):
             """UNIX domain sockets are strings or bytes.
 
             In case of bytes with a leading null-byte it's an abstract socket.

cheroot/test/test_server.py

@@ -3,6 +3,7 @@
 # vim: set fileencoding=utf-8 :
 
 import os
+import socket
 import tempfile
 import threading
 import time
@@ -33,6 +34,12 @@ def make_http_server(bind_addr):
     return httpserver
 
 
+non_windows_sock_test = pytest.mark.skipif(
+    not hasattr(socket, 'AF_UNIX'),
+    reason='UNIX domain sockets are only available under UNIX-based OS',
+)
+
+
 @pytest.fixture
 def http_server():
     """Provision a server creator as a fixture."""
@@ -80,14 +87,16 @@ def test_bind_addr_inet(http_server, ip_addr):
     assert httpserver.bind_addr[1] != EPHEMERAL_PORT
 
 
+@non_windows_sock_test
 def test_bind_addr_unix(http_server, unix_sock_file):
     """Check that bound UNIX socket address is stored in server."""
     httpserver = http_server.send(unix_sock_file)
 
     assert httpserver.bind_addr == unix_sock_file
 
 
-@pytest.mark.skip  # FIXME: investigate binding to abstract sockets issue
+@pytest.mark.skip(reason="Abstract sockets don't work currently")
+@non_windows_sock_test
 def test_bind_addr_unix_abstract(http_server):
     """Check that bound UNIX socket address is stored in server."""
     unix_abstract_sock = b'\x00cheroot/test/socket/here.sock'

cheroot/testing.py

@@ -121,7 +121,10 @@ def _probe_ipv6_sock(interface):
 
 
 def _get_conn_data(server):
-    host, port = server.bind_addr
+    if isinstance(server.bind_addr, tuple):
+        host, port = server.bind_addr
+    else:
+        host, port = server.bind_addr, 0
 
     interface = webtest.interface(host)