External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1760 from AlanCoding/fix_tests_25

Browse Source 
Fix tests fallout from 2.5 upgrade
This commit is contained in:
Shane McDonald 2018-04-16 15:51:11 -04:00 committed by GitHub
commit 0055c2ffff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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; \

7
awx/main/tests/unit/models/test_inventory.py
View File

@ -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')