From 14b91611c4ed16718bbfe9f9f11b76519d388ac3 Mon Sep 17 00:00:00 2001
From: Jono Gray <jonathan.gray@flowminder.org>
Date: Thu, 19 Sep 2019 12:13:22 +0100
Subject: [PATCH] Fix tests

---
 ..._construction.test_construct_query.approved.txt | 14 +++++++-------
 flowmachine/tests/test_utils.py                    |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/flowmachine/tests/test_query_object_construction.test_construct_query.approved.txt b/flowmachine/tests/test_query_object_construction.test_construct_query.approved.txt
index 7672b2df27..b4730338fb 100644
--- a/flowmachine/tests/test_query_object_construction.test_construct_query.approved.txt
+++ b/flowmachine/tests/test_query_object_construction.test_construct_query.approved.txt
@@ -1,5 +1,5 @@
 {
-  "0f2106014fee8e717c72d30b14fad8ab": {
+  "e4babc523792bb7942e23573656dbdbd": {
     "query_kind": "spatial_aggregate",
     "locations": {
       "query_kind": "daily_location",
@@ -16,7 +16,7 @@
       }
     }
   },
-  "75d67100b0382c34b4661a5ec8950fa6": {
+  "b6e172a4d83fc10be1e2cfbbb2f4a587": {
     "query_kind": "spatial_aggregate",
     "locations": {
       "query_kind": "daily_location",
@@ -27,7 +27,7 @@
       "sampling": null
     }
   },
-  "1a1e4e159d05f2ec1f081ac9c2bfd6d5": {
+  "d434d6a85c9ce3901668e3304b600d2d": {
     "query_kind": "location_event_counts",
     "start_date": "2016-01-01",
     "end_date": "2016-01-02",
@@ -37,7 +37,7 @@
     "event_types": null,
     "subscriber_subset": null
   },
-  "19419d8079d9c8e90afd057eb0871488": {
+  "d32b47b7f88ba4ad0b92a6b2dabce216": {
     "query_kind": "spatial_aggregate",
     "locations": {
       "query_kind": "modal_location",
@@ -64,7 +64,7 @@
     "query_kind": "geography",
     "aggregation_unit": "admin3"
   },
-  "de6836685ca2805baa1081c09f387e50": {
+  "65c6fef5077df4e3c3a3d712523f4cda": {
     "query_kind": "meaningful_locations_aggregate",
     "aggregation_unit": "admin1",
     "start_date": "2016-01-01",
@@ -157,7 +157,7 @@
     "tower_cluster_call_threshold": 0,
     "subscriber_subset": null
   },
-  "639b435514358b3e2319333e5016f56e": {
+  "47cae966b0bcf8bd3b9cb6d6d2192674": {
     "query_kind": "meaningful_locations_between_label_od_matrix",
     "aggregation_unit": "admin1",
     "start_date": "2016-01-01",
@@ -251,7 +251,7 @@
     "tower_cluster_call_threshold": 0,
     "subscriber_subset": null
   },
-  "98dad1d308b631753b3d4e37c7a63861": {
+  "77ac7078086f2cb74fa3af95e2b6b6b5": {
     "query_kind": "meaningful_locations_between_dates_od_matrix",
     "aggregation_unit": "admin1",
     "start_date_a": "2016-01-01",
diff --git a/flowmachine/tests/test_utils.py b/flowmachine/tests/test_utils.py
index 13fb60de03..86a68ef53e 100644
--- a/flowmachine/tests/test_utils.py
+++ b/flowmachine/tests/test_utils.py
@@ -189,9 +189,9 @@ def test_print_dependency_tree():
     expected_output = textwrap.dedent(
         """\
         <Query of type: MostFrequentLocation, query_id: 'xxxxx'>
+          - <Query of type: PolygonSpatialUnit, query_id: 'xxxxx'>
+             - <Table: 'geography.admin3', query_id: 'xxxxx'>
           - <Query of type: SubscriberLocations, query_id: 'xxxxx'>
-             - <Query of type: PolygonSpatialUnit, query_id: 'xxxxx'>
-                - <Table: 'geography.admin3', query_id: 'xxxxx'>
              - <Query of type: JoinToLocation, query_id: 'xxxxx'>
                 - <Query of type: PolygonSpatialUnit, query_id: 'xxxxx'>
                    - <Table: 'geography.admin3', query_id: 'xxxxx'>
@@ -204,8 +204,8 @@ def test_print_dependency_tree():
                       - <Query of type: CustomQuery, query_id: 'xxxxx'>
                       - <Table: 'events.calls', query_id: 'xxxxx'>
                          - <Table: 'events.calls', query_id: 'xxxxx'>
-          - <Query of type: PolygonSpatialUnit, query_id: 'xxxxx'>
-             - <Table: 'geography.admin3', query_id: 'xxxxx'>
+             - <Query of type: PolygonSpatialUnit, query_id: 'xxxxx'>
+                - <Table: 'geography.admin3', query_id: 'xxxxx'>
         """
     )