Disable more DNS tests that have begun to fail on CI but not locally.

src/greentest/test__socket_dns6.py

@@ -4,43 +4,59 @@ import greentest
 import socket
 from test__socket_dns import TestCase, add, RESOLVER_IS_ARES
 
+if not greentest.RUNNING_ON_CI:
 
-class Test6(TestCase):
 
-    # host that only has AAAA record
-    host = 'aaaa.test-ipv6.com'
+    # We can't control the DNS servers we use there
+    # for the system. This works best with the google DNS servers
+    # The getnameinfo test can fail on CI.
 
-    def test_empty(self):
-        self._test('getaddrinfo', self.host, 'http')
+    # Previously only Test6_ds failed, but as of Jan 2018, Test6
+    # and Test6_google begin to fail:
 
-    def test_inet(self):
-        self._test('getaddrinfo', self.host, None, socket.AF_INET)
+      # First differing element 0:
+    # 'vm2.test-ipv6.com'
+    # 'ip119.gigo.com'
 
-    def test_inet6(self):
-        self._test('getaddrinfo', self.host, None, socket.AF_INET6)
+    # - ('vm2.test-ipv6.com', [], ['2001:470:1:18::125'])
+    # ?   ---------  ^^                             ^^
 
-    def test_unspec(self):
-        self._test('getaddrinfo', self.host, None, socket.AF_UNSPEC)
+    # + ('ip119.gigo.com', [], ['2001:470:1:18::119'])
+    # ?     ^^^^^^^^                             ^^
 
+    class Test6(TestCase):
 
-class Test6_google(Test6):
-    host = 'ipv6.google.com'
+        # host that only has AAAA record
+        host = 'aaaa.test-ipv6.com'
 
-    def _normalize_result_getnameinfo(self, result):
-        if greentest.RUNNING_ON_CI and RESOLVER_IS_ARES:
-            # Disabled, there are multiple possibilities
-            # and we can get different ones, rarely.
-            return ()
-        return result
+        def test_empty(self):
+            self._test('getaddrinfo', self.host, 'http')
+
+        def test_inet(self):
+            self._test('getaddrinfo', self.host, None, socket.AF_INET)
+
+        def test_inet6(self):
+            self._test('getaddrinfo', self.host, None, socket.AF_INET6)
+
+        def test_unspec(self):
+            self._test('getaddrinfo', self.host, None, socket.AF_UNSPEC)
+
+
+    class Test6_google(Test6):
+        host = 'ipv6.google.com'
+
+        def _normalize_result_getnameinfo(self, result):
+            if greentest.RUNNING_ON_CI and RESOLVER_IS_ARES:
+                # Disabled, there are multiple possibilities
+                # and we can get different ones, rarely.
+                return ()
+            return result
+
+    add(Test6, Test6.host)
+    add(Test6_google, Test6_google.host)
 
-add(Test6, Test6.host)
-add(Test6_google, Test6_google.host)
 
 
-if not greentest.RUNNING_ON_CI:
-    # We can't control the DNS servers we use there
-    # for the system. This works best with the google DNS servers
-    # The getnameinfo test can fail on CI
     class Test6_ds(Test6):
         # host that has both A and AAAA records
         host = 'ds.test-ipv6.com'