]> git.proxmox.com Git - mirror_ovs.git/commitdiff
tests: Fix test that tests if the system doesn't support IPv6
authorTimothy Redaelli <tredaelli@redhat.com>
Mon, 11 Jun 2018 11:15:35 +0000 (13:15 +0200)
committerBen Pfaff <blp@ovn.org>
Thu, 14 Jun 2018 20:46:03 +0000 (13:46 -0700)
Currently if IPv6 is globally disabled (net.ipv6.conf.all.disable_ipv6=1) or
if IPv6 is disabled on loopback interface (net.ipv6.conf.lo.disable_ipv6=1)
the check doesn't work since no interface have ::1 and EADDRNOTAVAIL is
returned.

This causes a Python exception to be printed, like this:

Traceback (most recent call last):
  File "<string>", line 6, in <module>
  File "/usr/lib64/python2.7/socket.py", line 228, in meth
    return getattr(self._sock,name)(*args)
socket.error: [Errno 99] Cannot assign requested address

In this case HAVE_IPV6 is not set and all IPv6 tests fails.
This commit fixes the problem by check also for EADDRNOTAVAIL.

CC: Ben Pfaff <blp@ovn.org>
Fixes: 5c1d812d7fb3 ("tests: Avoid printing Python exception for hosts without IPv6 support.")
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
tests/atlocal.in

index 4e626266b01b62816ac1b12a3274ecb90e45ce31..6fc30cbf8e14413607f94a53aa141f5a570ec1eb 100644 (file)
@@ -123,7 +123,7 @@ import sys
 try:
     socket.socket(family=socket.AF_INET6).bind(("::1", 0, 0, 0))
 except socket.error as e:
-    if e.errno == errno.EAFNOSUPPORT:
+    if e.errno == errno.EAFNOSUPPORT or errno.EADDRNOTAVAIL:
         sys.exit(2)
     raise
 '