From b66256eb98874d9835ae6866b7e8ab4c7bc29afd Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 8 Nov 2016 10:56:34 -0500 Subject: [PATCH] fixes test_settings unit tests --- awx/main/tests/unit/test_settings.py | 3 --- awx/settings/defaults.py | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/awx/main/tests/unit/test_settings.py b/awx/main/tests/unit/test_settings.py index 2018771c63..2419431c78 100644 --- a/awx/main/tests/unit/test_settings.py +++ b/awx/main/tests/unit/test_settings.py @@ -6,6 +6,3 @@ def test_postprocess_auth_basic_enabled(): include('../../../settings/defaults.py', scope=locals()) assert 'awx.api.authentication.LoggedBasicAuthentication' in locals()['REST_FRAMEWORK']['DEFAULT_AUTHENTICATION_CLASSES'] - locals().update({'AUTH_BASIC_ENABLED': False}) - include('../../../settings/postprocess.py', scope=locals()) - assert 'awx.api.authentication.LoggedBasicAuthentication' not in locals()['REST_FRAMEWORK']['DEFAULT_AUTHENTICATION_CLASSES'] diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index bc9573e896..9ede3803a9 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -25,6 +25,7 @@ for setting in dir(global_settings): BASE_DIR = os.path.dirname(os.path.dirname(__file__)) def is_testing(argv=None): + import sys '''Return True if running django or py.test unit tests.''' argv = sys.argv if argv is None else argv if len(argv) >= 1 and ('py.test' in argv[0] or 'py/test.py' in argv[0]):