recordsansible/ara
Code Issues Proposed changes

Merge "Rename the notion of parameters to arguments"

Browse Source
This commit is contained in:
Zuul
2018-10-15 15:21:23 +00:00
committed by Gerrit Code Review
parent 1d3860a705 128270dd08
commit 6158d79b34
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ara/api/tests/factories.py
View File

@@ -23,7 +23,7 @@ from ara.api.tests import utils
# constants for things like compressed byte strings or objects
FILE_CONTENTS = "---\n# Example file"
HOST_FACTS = {"ansible_fqdn": "hostname", "ansible_distribution": "CentOS"}
PLAYBOOK_PARAMETERS = {"ansible_version": "2.5.5", "inventory": "/etc/ansible/hosts"}
PLAYBOOK_ARGUMENTS = {"ansible_version": "2.5.5", "inventory": "/etc/ansible/hosts"}
RESULT_CONTENTS = {"results": [{"msg": "something happened"}]}
LABEL_DESCRIPTION = "label description"
TASK_TAGS = ["always", "never"]
@@ -60,7 +60,7 @@ class PlaybookFactory(factory.DjangoModelFactory):
ansible_version = "2.4.0"
completed = True
parameters = utils.compressed_obj(PLAYBOOK_PARAMETERS)
arguments = utils.compressed_obj(PLAYBOOK_ARGUMENTS)
file = factory.SubFactory(FileFactory)

12
ara/api/tests/tests_playbook.py
View File

@@ -43,23 +43,23 @@ class PlaybookTestCase(APITestCase):
self.assertEqual(playbook.name, "serializer-playbook")
self.assertEqual(playbook.ansible_version, "2.4.0")
def test_playbook_serializer_compress_parameters(self):
def test_playbook_serializer_compress_arguments(self):
serializer = serializers.PlaybookSerializer(
data={
"ansible_version": "2.4.0",
"file": {"path": "/path/playbook.yml", "content": factories.FILE_CONTENTS},
"parameters": factories.PLAYBOOK_PARAMETERS,
"arguments": factories.PLAYBOOK_ARGUMENTS,
}
)
serializer.is_valid()
playbook = serializer.save()
playbook.refresh_from_db()
self.assertEqual(playbook.parameters, utils.compressed_obj(factories.PLAYBOOK_PARAMETERS))
self.assertEqual(playbook.arguments, utils.compressed_obj(factories.PLAYBOOK_ARGUMENTS))
def test_playbook_serializer_decompress_parameters(self):
playbook = factories.PlaybookFactory(parameters=utils.compressed_obj(factories.PLAYBOOK_PARAMETERS))
def test_playbook_serializer_decompress_arguments(self):
playbook = factories.PlaybookFactory(arguments=utils.compressed_obj(factories.PLAYBOOK_ARGUMENTS))
serializer = serializers.PlaybookSerializer(instance=playbook)
self.assertEqual(serializer.data["parameters"], factories.PLAYBOOK_PARAMETERS)
self.assertEqual(serializer.data["arguments"], factories.PLAYBOOK_ARGUMENTS)
def test_get_no_playbooks(self):
request = self.client.get("/api/v1/playbooks")