From d2f99ad549994533c4000c2586a9d8a2ace6ddcb Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Thu, 17 Dec 2015 14:00:17 -0500
Subject: [PATCH] Handle operationalerror for unit tests

---
 awx/main/conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/awx/main/conf.py b/awx/main/conf.py
index f1b572783d..4a6b97037b 100644
--- a/awx/main/conf.py
+++ b/awx/main/conf.py
@@ -5,6 +5,7 @@ import logging
 
 from django.conf import settings as django_settings
 from django.db.utils import ProgrammingError
+from django.db import OperationalError
 from awx.main.models.configuration import TowerSettings
 
 logger = logging.getLogger('awx.main.conf')
@@ -26,7 +27,7 @@ class TowerConfiguration(object):
                     val_actual = default_value
                 return val_actual
             return ts[0].value_converted
-        except ProgrammingError, e:
+        except (ProgrammingError, OperationalError), e:
             # Database is not available yet, usually during migrations so lets use the default
             logger.debug("Database settings not available yet, using defaults ({0})".format(e))
             return default_value