diff --git a/awx/main/tests/functional/api/test_fact_view.py b/awx/main/tests/functional/api/test_fact_view.py index 2282baeef7..6db1889943 100644 --- a/awx/main/tests/functional/api/test_fact_view.py +++ b/awx/main/tests/functional/api/test_fact_view.py @@ -1,6 +1,5 @@ import mock import pytest -import json from awx.main.utils import timestamp_apiformat from django.core.urlresolvers import reverse @@ -94,7 +93,7 @@ def test_content(hosts, fact_scans, get, user, fact_ansible_json): (fact_known, response) = setup_common(hosts, fact_scans, get, user) assert fact_known.host_id == response.data['host'] - assert fact_ansible_json == json.loads(response.data['facts']) + assert fact_ansible_json == response.data['facts'] assert timestamp_apiformat(fact_known.timestamp) == response.data['timestamp'] assert fact_known.module == response.data['module'] @@ -104,7 +103,7 @@ def _test_search_by_module(hosts, fact_scans, get, user, fact_json, module_name) } (fact_known, response) = setup_common(hosts, fact_scans, get, user, module_name=module_name, get_params=params) - assert fact_json == json.loads(response.data['facts']) + assert fact_json == response.data['facts'] assert timestamp_apiformat(fact_known.timestamp) == response.data['timestamp'] assert module_name == response.data['module'] diff --git a/awx/main/tests/functional/commands/test_run_fact_cache_receiver.py b/awx/main/tests/functional/commands/test_run_fact_cache_receiver.py index a6006c7427..e8eaad3128 100644 --- a/awx/main/tests/functional/commands/test_run_fact_cache_receiver.py +++ b/awx/main/tests/functional/commands/test_run_fact_cache_receiver.py @@ -4,7 +4,6 @@ # Python import pytest from datetime import datetime -import json # Django from django.utils import timezone @@ -80,12 +79,12 @@ def test_process_facts_message_ansible_overwrite(fact_scans, fact_msg_ansible): fact_obj = Fact.objects.get(id=fact_returned.id) assert key in fact_obj.facts - assert json.loads(fact_obj.facts) == fact_msg_ansible['facts'] - assert value == json.loads(fact_obj.facts)[key] + assert fact_obj.facts == fact_msg_ansible['facts'] + assert value == fact_obj.facts[key] # Ensure that the message flows from the socket through to process_fact_message() @pytest.mark.django_db -def test_run_receiver(mocker, fact_msg_ansible): +def test_run_receiver(mocker, fact_msg_ansible): mocker.patch("awx.main.socket.Socket.listen", return_value=[fact_msg_ansible]) receiver = FactCacheReceiver()