Merge pull request basho#347 from basho/bugfix/bch/timeout-test

Attempt to fix exception thrown in test_index_timeout()

Author: Sean Cribbs

riak/transports/security.py

@@ -76,7 +76,13 @@ def sendall(self, data):
         return self.connection.sendall(bytes(data))
 
     def close(self):
-        return self.connection.shutdown()
+        try:
+            return self.connection.shutdown()
+        except OpenSSL.SSL.Error as err:
+            if err.args == ([],):
+                return False
+            else:
+                raise err
 
 
 # Blatantly Stolen from