4810. [test] The chain system test failed if the IPv6 interfaces

                        were not configured. [RT #46508]

diff --git a/CHANGES b/CHANGES
index 97155d19cea597cc4369aefd4ac2e10201d94cd7..8aca06cce56410c3765e0c45bdecd8d796cc41b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4810.  [test]          The chain system test failed if the IPv6 interfaces
+                       were not configured. [RT #46508]
+
        --- 9.12.0b2 released ---
 
 4809.  [port]          Check at configure time whether -latomic is needed

diff --git a/bin/tests/system/chain/ans4/ans.py b/bin/tests/system/chain/ans4/ans.py
index 80c519c382cf809936e0a2a9397f4eee55ee1a8a..b2733f04b787b10ada31e3ae5339c2480437d28e 100755 (executable)
--- a/bin/tests/system/chain/ans4/ans.py
+++ b/bin/tests/system/chain/ans4/ans.py
@@ -254,7 +254,7 @@ def create_response(msg):
 def sigterm(signum, frame):
     print ("Shutting down now...")
     os.remove('ans.pid')
-    running = 0
+    running = False
     sys.exit(0)
 
 ############################################################################
@@ -270,8 +270,17 @@ sock = 5300
 
 query4_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 query4_socket.bind((ip4, sock))
-query6_socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-query6_socket.bind((ip6, sock))
+
+havev6 = True
+try:
+    query6_socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+    try:
+        query6_socket.bind((ip6, sock))
+    except:
+        query6_socket.close()
+        havev6 = False
+except:
+    havev6 = False
 
 ctrl_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 ctrl_socket.bind((ip4, sock + 1))
@@ -284,14 +293,18 @@ pid = os.getpid()
 print (pid, file=f)
 f.close()
 
-running = 1
+running = True
 
 print ("Listening on %s port %d" % (ip4, sock))
-print ("Listening on %s port %d" % (ip6, sock))
+if havev6:
+    print ("Listening on %s port %d" % (ip6, sock))
 print ("Control channel on %s port %d" % (ip4, sock + 1))
 print ("Ctrl-c to quit")
 
-input = [query4_socket, query6_socket, ctrl_socket]
+if havev6:
+    input = [query4_socket, query6_socket, ctrl_socket]
+else:
+    input = [query4_socket, ctrl_socket]
 
 while running:
     try: