From 203df91a5d2625113ac126c40dfdb76c08beb778 Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Mon, 3 Oct 2016 09:28:01 -0400
Subject: [PATCH] more robust test mode checking

---
 awx/main/managers.py     | 3 ++-
 awx/settings/defaults.py | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/awx/main/managers.py b/awx/main/managers.py
index 15e1c9d655..86c3367140 100644
--- a/awx/main/managers.py
+++ b/awx/main/managers.py
@@ -4,6 +4,7 @@
 import sys
 
 from django.db import models
+from django.conf import settings
 
 
 class HostManager(models.Manager):
@@ -25,7 +26,7 @@ class InstanceManager(models.Manager):
     def me(self):
         """Return the currently active instance."""
         # If we are running unit tests, return a stub record.
-        if len(sys.argv) >= 2 and sys.argv[1] == 'test':
+        if settings.IS_TESTING(sys.argv):
             return self.model(id=1,
                               hostname='localhost',
                               uuid='00000000-0000-0000-0000-000000000000')
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 9da2142c19..f24ee87838 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -30,6 +30,9 @@ def is_testing(argv=None):
         return True
     return False
 
+def IS_TESTING(argv=None):
+    return is_testing(argv)
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 SQL_DEBUG = DEBUG