From 54f2839e34dcb13549fec63fa68783e19a30ed1a Mon Sep 17 00:00:00 2001
From: Jeff Lane <jeffrey.lane@canonical.com>
Date: Mon, 27 Mar 2017 17:12:10 -0400
Subject: Back out use of NewConnectionError which does not exist in the Trusty
 version of urllib3, causing script to break on Trusty LP: #1676585

---
 bin/virtualization | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/virtualization b/bin/virtualization
index ff11061..e221261 100755
--- a/bin/virtualization
+++ b/bin/virtualization
@@ -31,7 +31,6 @@ import re
 import logging
 import lsb_release
 import requests
-from requests.packages.urllib3.exceptions import NewConnectionError
 import shlex
 import signal
 from subprocess import (
@@ -250,9 +249,9 @@ class KVMTest(object):
             # test our URL to make sure it's reachable
             try:
                 ret = requests.head(url)
-            except (OSError, NewConnectionError) as e:
+            except OSError as e:
                 logging.error("Unable to connect to {}".format(url))
-                logging.error(e)
+                logging.error(" * Message: {}".format(e.with_traceback(None)))
                 return False
 
             if ret.status_code is not 200:
-- 
cgit v1.2.3