patch 8.2.4690: channel tests fail on MS-Windows

Problem:    Channel tests fail on MS-Windows.
Solution:   Check if the AF_UNIX attribute exists. (closes #10083)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index b0c3140927efed8b85d13139c71c9b0f0be030a6..3ef0fde0f83eb1a40ae078230f6a536ba597aa09 100644 (file)
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -19,12 +19,7 @@ except ImportError:
     # Python 2
     import SocketServer as socketserver
 
-class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
-
-    def setup(self):
-        if self.server.address_family != socket.AF_UNIX:
-            self.request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-
+class TestingRequestHandler(socketserver.BaseRequestHandler):
     def handle(self):
         print("=== socket opened ===")
         while True:
@@ -240,6 +235,10 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                 elif decoded[0] < 0:
                     last_eval = decoded
 
+class ThreadedTCPRequestHandler(TestingRequestHandler):
+    def setup(self):
+        self.request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+
 class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
     pass
 

diff --git a/src/testdir/test_channel_unix.py b/src/testdir/test_channel_unix.py
index 4836e26ab82d73838ca4c7f9244acb4d1ab0eda7..85e780a388607cb60b08c4f8499cfdb689b9b575 100644 (file)
--- a/src/testdir/test_channel_unix.py
+++ b/src/testdir/test_channel_unix.py
@@ -6,7 +6,7 @@
 # This requires Python 2.6 or later.
 
 from __future__ import print_function
-from test_channel import ThreadedTCPServer, ThreadedTCPRequestHandler, \
+from test_channel import ThreadedTCPServer, TestingRequestHandler, \
     writePortInFile
 import socket
 import threading
@@ -18,11 +18,17 @@ except NameError:
     # Python 2
     FileNotFoundError = (IOError, OSError)
 
+if not hasattr(socket, "AF_UNIX"):
+    raise NotImplementedError("Unix sockets are not supported on this platform")
+
 class ThreadedUnixServer(ThreadedTCPServer):
     address_family = socket.AF_UNIX
 
+class ThreadedUnixRequestHandler(TestingRequestHandler):
+    pass
+
 def main(path):
-    server = ThreadedUnixServer(path, ThreadedTCPRequestHandler)
+    server = ThreadedUnixServer(path, ThreadedUnixRequestHandler)
 
     # Start a thread with the server.  That thread will then start a new thread
     # for each connection.

diff --git a/src/version.c b/src/version.c
index 6e9b1d49a897c043e35d71d4a7477435e5a294e5..5805264493a9cb17c1e830f0afa1bfda6114ad41 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4690,
 /**/
     4689,
 /**/