From: Charles-François Natali <cf.natali@gmail.com>
Date: Tue, 9 Jul 2013 17:15:43 +0000 (+0200)
Subject: Issue #18308: don't take the scope ID into account when comparing IPv6
X-Git-Tag: v3.4.0a1~270^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37114bb548f3e3062417bc2be9ac9ab230988331;p=thirdparty%2FPython%2Fcpython.git

Issue #18308: don't take the scope ID into account when comparing IPv6
addresses.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 25bf0a189fa4..0048e3d074a7 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -3225,7 +3225,11 @@ class RecvmsgIntoUDPTest(RecvmsgIntoTests, SendrecvmsgUDPTestBase):
 class SendrecvmsgUDP6TestBase(SendrecvmsgDgramFlagsBase,
                               SendrecvmsgConnectionlessBase,
                               ThreadedSocketTestMixin, UDP6TestBase):
-    pass
+
+    def checkRecvmsgAddress(self, addr1, addr2):
+        # Called to compare the received address with the address of
+        # the peer, ignoring scope ID
+        self.assertEqual(addr1[:-1], addr2[:-1])
 
 @requireAttrs(socket.socket, "sendmsg")
 @unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.')