From b01fe663affb9023f4e27bdd8e147e6a8ed59c96 Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Mon, 4 Apr 2016 11:57:22 -0400
Subject: [PATCH] Fix up tests for vacated settings

---
 awx/main/tests/old/settings.py        | 1 +
 awx/main/tests/unit/api/test_views.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/awx/main/tests/old/settings.py b/awx/main/tests/old/settings.py
index d2ab4440c5..93ce2963a1 100644
--- a/awx/main/tests/old/settings.py
+++ b/awx/main/tests/old/settings.py
@@ -46,6 +46,7 @@ TEST_TOWER_SETTINGS_MANIFEST = {
 }
 
 @override_settings(TOWER_SETTINGS_MANIFEST=TEST_TOWER_SETTINGS_MANIFEST)
+@pytest.mark.skip(reason="Settings deferred to 3.1")
 class SettingsPlaceholder(BaseTest):
 
     def setUp(self):
diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py
index 6a7668c472..a5d63906c5 100644
--- a/awx/main/tests/unit/api/test_views.py
+++ b/awx/main/tests/unit/api/test_views.py
@@ -16,7 +16,7 @@ class TestApiV1RootView:
             'authtoken',
             'ping',
             'config',
-            'settings',
+            #'settings',
             'me',
             'dashboard',
             'organizations',