Fix test

Author: nanjekyejoannah

Lib/socket.py

@@ -13,7 +13,7 @@
 socketpair() -- create a pair of new socket objects [*]
 fromfd() -- create a socket object from an open file descriptor [*]
 send_fds() -- Send file descriptor to the socket.
-recv_fds() -- Recieve file descriptor from the socket.
+recv_fds() -- Recieve file descriptors from the socket.
 fromshare() -- create a socket object from data received from socket.share() [*]
 gethostname() -- return the current hostname
 gethostbyname() -- map a hostname to its IP number
@@ -493,7 +493,6 @@ def recv_fds(sock, bufsize, maxfds, flags=0):
             _socket.CMSG_LEN(maxfds * fds.itemsize))
         for cmsg_level, cmsg_type, cmsg_data in ancdata:
             if (cmsg_level == _socket.SOL_SOCKET and cmsg_type == _socket.SCM_RIGHTS):
-                # Append data, ignoring any truncated integers at the end.
                 fds.frombytes(cmsg_data[:
                         len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
 

Lib/test/test_socket.py

@@ -6186,11 +6186,53 @@ def test_dual_stack_client_v6(self):
             self.echo_server(sock)
             self.echo_client(("::1", port), socket.AF_INET6)
 
+@requireAttrs(socket, "send_fds")
+@requireAttrs(socket, "recv_fds")
+@requireAttrs(socket, "AF_UNIX")
+class SendRecvFdsTests(unittest.TestCase):
+    def testSendAndRecvFds(self):
+        def close_pipes(pipes):
+            for fd1, fd2 in pipes:
+                os.close(fd1)
+                os.close(fd2)
+
+        def close_fds(fds):
+            for fd in fds:
+                os.close(fd)
+
+        # send 10 file descriptors
+        pipes = [os.pipe() for _ in range(10)]
+        self.addCleanup(close_pipes, pipes)
+        fds = [rfd for rfd, wfd in pipes]
+
+        # use a UNIX socket pair to exchange file descriptors locally
+        sock1, sock2 = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
+        with sock1, sock2:
+            socket.send_fds(sock1, [MSG], fds)
+            # request more data and file descriptors than expected
+            msg, fds2, flags, addr = socket.recv_fds(sock2, len(MSG) * 2, len(fds) * 2)
+            self.addCleanup(close_fds, fds2)
+
+        self.assertEqual(msg, MSG)
+        self.assertEqual(len(fds2), len(fds))
+        self.assertEqual(flags, 0)
+        # don't test addr
+
+        # test that file descriptors are connected
+        for index, fds in enumerate(pipes):
+            rfd, wfd = fds
+            os.write(wfd, str(index).encode())
+
+        for index, rfd in enumerate(fds2):
+            data = os.read(rfd, 100)
+            self.assertEqual(data,  str(index).encode())
+
 
 def test_main():
     tests = [GeneralModuleTests, BasicTCPTest, TCPCloserTest, TCPTimeoutTest,
              TestExceptions, BufferIOTest, BasicTCPTest2, BasicUDPTest,
-             UDPTimeoutTest, CreateServerTest, CreateServerFunctionalTest]
+             UDPTimeoutTest, CreateServerTest, CreateServerFunctionalTest,
+             SendRecvFdsTests]
 
     tests.extend([
         NonBlockingTCPTests,
@@ -6255,47 +6297,5 @@ def test_main():
     support.threading_cleanup(*thread_info)
 
 
-@requireAttrs(socket, "send_fds")
-@requireAttrs(socket, "recv_fds")
-@requireAttrs(socket, "AF_UNIX")
-class SendRecvFdsTests(unittest.TestCase):
-    def testSendAndRecvFds(self):
-        def close_pipes(pipes):
-            for fd1, fd2 in pipes:
-                os.close(fd1)
-                os.close(fd2)
-
-        def close_fds(fds):
-            for fd in fds:
-                os.close(fd)
-
-        # send 10 file descriptors
-        pipes = [os.pipe() for _ in range(10)]
-        self.addCleanup(close_pipes, pipes)
-        fds = [fd2 for fd1, fd2 in pipes]
-
-        # use a UNIX socket pair to exchange file descriptors locally
-        sock1, sock2 = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
-        with sock1, sock2:
-            socket.send_fds(sock1, [MSG], fds)
-            # request more data and file descriptors than expected
-            msg, fds2, flags, addr = socket.recv_fds(sock2, len(MSG) * 2, len(fds) * 2)
-            self.addCleanup(close_fds, fds2)
-
-        self.assertEqual(msg, MSG)
-        self.assertEqual(len(fds2), len(fds))
-        self.assertEqual(flags, 0)
-        # don't test addr
-
-        # test that file descriptors are connected
-        for index, fds in enumerate(pipes):
-            fd1, fd2 = fds
-            os.write(fd1, str(index).encode())
-
-        for index, fd in enumerate(fds2):
-            data = os.read(fd, 100)
-            self.assertEqual(data,  str(index).encode())
-
-
 if __name__ == "__main__":
     test_main()