External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-09 07:18:05 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix migration issues, tests, and templates

Browse Source
This commit is contained in:
Wayne Witzel III
2017-11-09 17:24:54 -05:00
parent 6d6bbbb627
commit 96904968d8
21 changed files with 346 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tests/functional/commands/test_commands.py
View File

@@ -39,8 +39,8 @@ def run_command(name, *args, **options):
@pytest.mark.parametrize(
"username,password,expected,changed", [
('admin', 'dingleberry', 'Password updated\n', True),
('admin', 'admin', 'Password not updated\n', False),
('admin', 'dingleberry', 'Password updated', True),
('admin', 'admin', 'Password not updated', False),
(None, 'foo', 'username required', False),
('admin', None, 'password required', False),
]

12
awx/main/tests/functional/commands/test_inventory_import.py
View File

@@ -92,7 +92,7 @@ class TestInvalidOptionsFunctional:
cmd = inventory_import.Command()
with mock.patch('django.db.transaction.rollback'):
with pytest.raises(IOError) as err:
cmd.handle_noargs(
cmd.handle(
inventory_id=inventory.id,
source='/tmp/pytest-of-root/pytest-7/inv_files0-invalid')
assert 'Source does not exist' in err.value.message
@@ -100,14 +100,14 @@ class TestInvalidOptionsFunctional:
def test_invalid_inventory_id(self):
cmd = inventory_import.Command()
with pytest.raises(CommandError) as err:
cmd.handle_noargs(inventory_id=42, source='/notapath/shouldnotmatter')
cmd.handle(inventory_id=42, source='/notapath/shouldnotmatter')
assert 'id = 42' in err.value.message
assert 'cannot be found' in err.value.message
def test_invalid_inventory_name(self):
cmd = inventory_import.Command()
with pytest.raises(CommandError) as err:
cmd.handle_noargs(inventory_name='fooservers', source='/notapath/shouldnotmatter')
cmd.handle(inventory_name='fooservers', source='/notapath/shouldnotmatter')
assert 'name = fooservers' in err.value.message
assert 'cannot be found' in err.value.message
@@ -122,7 +122,7 @@ class TestINIImports:
@mock.patch.object(inventory_import.AnsibleInventoryLoader, 'load', mock.MagicMock(return_value=TEST_MEM_OBJECTS))
def test_inventory_single_ini_import(self, inventory, capsys):
cmd = inventory_import.Command()
r = cmd.handle_noargs(
r = cmd.handle(
inventory_id=inventory.pk, source=__file__,
method='backport')
out, err = capsys.readouterr()
@@ -192,7 +192,7 @@ class TestINIImports:
)
def test_hostvars_are_saved(self, inventory):
cmd = inventory_import.Command()
cmd.handle_noargs(inventory_id=inventory.pk, source='doesnt matter')
cmd.handle(inventory_id=inventory.pk, source='doesnt matter')
assert inventory.hosts.count() == 1
h = inventory.hosts.all()[0]
assert h.name == 'foo'
@@ -219,4 +219,4 @@ class TestINIImports:
)
def test_recursive_group_error(self, inventory):
cmd = inventory_import.Command()
cmd.handle_noargs(inventory_id=inventory.pk, source='doesnt matter')
cmd.handle(inventory_id=inventory.pk, source='doesnt matter')