Merge lp:~vorlon/ubuntu-system-image/lp1196991 into lp:~barry/ubuntu-system-image/lp1196991

[Steve Langasek]

Partial fix for the hangs in the testsuite waiting for the http server to
shutdown. Sometimes the server still waits 2 minutes while shutting down,
even though the socket has been closed - the delay is in server.shutdown(),
not in conn.close(), so it's probably something to do with the ssl socket
wrapper or the HTTPServer connection state.

[Barry Warsaw (barry)]

This looks like it's still useful as a safety net. Thanks!

review: Approve

=== modified file 'systemimage/testing/helpers.py'
--- systemimage/testing/helpers.py	2013-09-24 21:52:55 +0000
+++ systemimage/testing/helpers.py	2013-09-25 23:55:00 +0000
@@ -53,6 +53,7 @@
 from systemimage.index import Index
 from threading import Thread
 from unittest.mock import patch
+from socket import SHUT_RDWR
 
 
 EMPTYSTRING = ''
@@ -157,6 +158,8 @@
             import time; start = time.time()
             #print('CONN:', connections, file=sys.stderr)
             for conn in connections:
+                if conn.fileno() != -1:
+                    conn.shutdown(SHUT_RDWR)
                 conn.close()
             server.shutdown()
             end = time.time()