From 4a1a3bd1e83d12395a0fe88ec723e132d48925b0 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 18 Nov 2016 11:24:41 -0500 Subject: [PATCH] do not coerce jsonbfield to string in db * functional tests do coerce because they assume they are running on sqlite --- .../models/fact/test_get_host_fact.py | 10 +++++----- .../models/fact/test_get_timeline.py | 18 +++++++++--------- requirements/requirements.txt | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/awx/main/tests/functional/models/fact/test_get_host_fact.py b/awx/main/tests/functional/models/fact/test_get_host_fact.py index dc97592ab0..0388e12f08 100644 --- a/awx/main/tests/functional/models/fact/test_get_host_fact.py +++ b/awx/main/tests/functional/models/fact/test_get_host_fact.py @@ -7,7 +7,7 @@ from awx.main.models import Fact @pytest.mark.django_db -def test_newest_scan_exact(hosts, fact_scans): +def test_newest_scan_exact(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() hosts = hosts(host_count=2) facts = fact_scans(fact_scans=3, timestamp_epoch=epoch) @@ -23,7 +23,7 @@ def test_newest_scan_exact(hosts, fact_scans): @pytest.mark.django_db -def test_newest_scan_less_than(hosts, fact_scans): +def test_newest_scan_less_than(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): ''' Show me the most recent state of the sytem at any point of time. or, said differently @@ -52,7 +52,7 @@ def test_newest_scan_less_than(hosts, fact_scans): @pytest.mark.django_db -def test_query_middle_of_timeline(hosts, fact_scans): +def test_query_middle_of_timeline(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): ''' Tests query Fact that is in the middle of the fact scan timeline, but not an exact timestamp. ''' @@ -74,7 +74,7 @@ def test_query_middle_of_timeline(hosts, fact_scans): @pytest.mark.django_db -def test_query_result_empty(hosts, fact_scans): +def test_query_result_empty(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): ''' Query time less than any fact scan. Should return None ''' @@ -89,7 +89,7 @@ def test_query_result_empty(hosts, fact_scans): @pytest.mark.django_db -def test_by_module(hosts, fact_scans): +def test_by_module(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): ''' Query by fact module other than 'ansible' ''' diff --git a/awx/main/tests/functional/models/fact/test_get_timeline.py b/awx/main/tests/functional/models/fact/test_get_timeline.py index 192bd40e86..940498f913 100644 --- a/awx/main/tests/functional/models/fact/test_get_timeline.py +++ b/awx/main/tests/functional/models/fact/test_get_timeline.py @@ -23,7 +23,7 @@ def setup_common(hosts, fact_scans, ts_from=None, ts_to=None, epoch=timezone.now @pytest.mark.django_db -def test_all(hosts, fact_scans): +def test_all(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch - timedelta(days=1) ts_to = epoch + timedelta(days=10) @@ -34,7 +34,7 @@ def test_all(hosts, fact_scans): @pytest.mark.django_db -def test_all_ansible(hosts, fact_scans): +def test_all_ansible(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch - timedelta(days=1) ts_to = epoch + timedelta(days=10) @@ -48,7 +48,7 @@ def test_all_ansible(hosts, fact_scans): @pytest.mark.django_db -def test_empty_db(hosts, fact_scans): +def test_empty_db(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): hosts = hosts(host_count=2) epoch = timezone.now() ts_from = epoch - timedelta(days=1) @@ -60,7 +60,7 @@ def test_empty_db(hosts, fact_scans): @pytest.mark.django_db -def test_no_results(hosts, fact_scans): +def test_no_results(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch - timedelta(days=100) ts_to = epoch - timedelta(days=50) @@ -70,7 +70,7 @@ def test_no_results(hosts, fact_scans): @pytest.mark.django_db -def test_exact_same_equal(hosts, fact_scans): +def test_exact_same_equal(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_to = ts_from = epoch + timedelta(days=1) @@ -82,7 +82,7 @@ def test_exact_same_equal(hosts, fact_scans): @pytest.mark.django_db -def test_exact_from_exclusive_to_inclusive(hosts, fact_scans): +def test_exact_from_exclusive_to_inclusive(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch + timedelta(days=1) ts_to = epoch + timedelta(days=2) @@ -96,7 +96,7 @@ def test_exact_from_exclusive_to_inclusive(hosts, fact_scans): @pytest.mark.django_db -def test_to_lte(hosts, fact_scans): +def test_to_lte(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_to = epoch + timedelta(days=1) @@ -111,7 +111,7 @@ def test_to_lte(hosts, fact_scans): @pytest.mark.django_db -def test_from_gt(hosts, fact_scans): +def test_from_gt(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch @@ -126,7 +126,7 @@ def test_from_gt(hosts, fact_scans): @pytest.mark.django_db -def test_no_ts(hosts, fact_scans): +def test_no_ts(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() (facts_known, fact_objs) = setup_common(hosts, fact_scans, ts_from=None, ts_to=None, epoch=epoch) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 1ee9a35ede..952050fd24 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -24,7 +24,7 @@ django-celery==3.1.17 django-crum==0.6.1 django-extensions==1.5.9 django-jsonfield==1.0.1 -git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield +git+https://github.com/ansible/django-jsonbfield@master#egg=jsonbfield django-polymorphic==0.7.2 django-radius==1.0.0 djangorestframework==3.3.2