From 2564ef70281f6fb16d4564ea4b87a345e9910c45 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 27 Aug 2014 14:01:16 -0600 Subject: [PATCH] Don't explode on ConnectionError in list_locks() Signed-off-by: Zack Cerza --- teuthology/lock.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index 29a8b9b853..1bf97f01cb 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -337,8 +337,12 @@ def list_locks(keyed_by_name=False, **kwargs): if 'machine_type' in kwargs: kwargs['machine_type'] = kwargs['machine_type'].replace(',','|') uri += '?' + urllib.urlencode(kwargs) - response = requests.get(uri) - success = response.ok + try: + response = requests.get(uri) + except requests.ConnectionError: + success = False + else: + success = response.ok if success: if not keyed_by_name: return response.json() -- 2.39.5