commit 211883d09a8b5cd313deb02f6755623d5029fc18
author Monty Taylor <mordred@inaugust.com> Wed Sep 06 08:40:47 2017 -0500
committer Monty Taylor <mordred@inaugust.com> Thu Sep 07 09:45:18 2017 -0500
tree 16d7f24bec4c2a6fce7ab4b16ef5cf8b057713b2
parent b286f16dd044e4f99e706f77c28a28cf349e07bb

Update tests to use AF_INET6

zuul_console now properly uses AF_INET6, but some of our tests were
still using AF_INET. There are some sporadic failures with the streaming
test that show some connection errors. It's possible AF_INET6 is a red
herring, but it's also not incorrect to set it, so let's go ahead and
update it.

While we're at it - use the create_connection form like we do in
zuul_stream rather than the s = socket.socket ; s.connect form.

Change-Id: I278efb939cb6540b5fe2fb1a06495d9be5a7f997

tests/unit/test_log_streamer.py

diff --git a/tests/unit/test_log_streamer.py b/tests/unit/test_log_streamer.py
index f47a8c8..03d3563 100644
--- a/tests/unit/test_log_streamer.py
+++ b/tests/unit/test_log_streamer.py
@@ -22,6 +22,7 @@
 import os.path
 import socket
 import tempfile
+import testtools
 import threading
 import time
 
@@ -46,16 +47,13 @@
         streamer = self.startStreamer(port)
         self.addCleanup(streamer.stop)
 
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.addCleanup(s.close)
-        self.assertEqual(0, s.connect_ex((self.host, port)))
+        s = socket.create_connection((self.host, port))
         s.close()
 
         streamer.stop()
 
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.addCleanup(s.close)
-        self.assertNotEqual(0, s.connect_ex((self.host, port)))
+        with testtools.ExpectedException(ConnectionRefusedError):
+            s = socket.create_connection((self.host, port))
         s.close()
 
 
@@ -80,8 +78,7 @@
             root = tempfile.gettempdir()
         self.streamer = zuul.lib.log_streamer.LogStreamer(None, self.host,
                                                           port, root)
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.connect((self.host, port))
+        s = socket.create_connection((self.host, port))
         self.addCleanup(s.close)
 
         req = '%s\n' % build_uuid
@@ -237,8 +234,11 @@
         self.addCleanup(web_server.stop)
 
         # Wait until web server is started
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            while s.connect_ex((self.host, 9000)):
+        while True:
+            try:
+                with socket.create_connection((self.host, 9000)):
+                    break
+            except ConnectionRefusedError:
                 time.sleep(0.1)
 
         # Start a thread with the websocket client