From de07ef0680c53206779dbd8c1cddd3fae69e748f Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 12 Apr 2018 14:34:44 -0400
Subject: [PATCH] fix tests fallout from 2.5 upgrade

---
 Makefile                                     | 2 +-
 awx/main/tests/unit/models/test_inventory.py | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 41310bf678..8ed3aee8f3 100644
--- a/Makefile
+++ b/Makefile
@@ -369,7 +369,7 @@ check: flake8 pep8 # pyflakes pylint
 
 TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests
 # Run all API unit tests.
-test: test_ansible
+test:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
diff --git a/awx/main/tests/unit/models/test_inventory.py b/awx/main/tests/unit/models/test_inventory.py
index 41fa27644c..7c58fa9972 100644
--- a/awx/main/tests/unit/models/test_inventory.py
+++ b/awx/main/tests/unit/models/test_inventory.py
@@ -84,13 +84,6 @@ class TestControlledBySCM():
 
         inv_src.clean_overwrite_vars()
 
-    def test_clean_overwrite_vars_invalid(self):
-        inv_src = InventorySource(overwrite_vars=False,
-                                  source='scm')
-
-        with pytest.raises(ValidationError):
-            inv_src.clean_overwrite_vars()
-
     def test_clean_source_path_valid(self):
         inv_src = InventorySource(source_path='/not_real/',
                                   source='scm')