Attempt to fix tests #1

mozilla · Nov 24, 2023 · ea5bf89 · ea5bf89
1 parent 95121a0
commit ea5bf89
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/...ed/firefox_android_clients_v1/test_baseline_no_first_session_with_activations/expect.yaml b/...ed/firefox_android_clients_v1/test_baseline_no_first_session_with_activations/expect.yaml
@@ -9,31 +9,29 @@
   last_reported_device_model: model-2
   last_reported_channel: release
   activated: true
-  install_source: com.android.vending
   channel: release
+  install_source: com.android.vending
   metadata:
+    install_source__source_ping: metrics
+    install_source__source_ping_datetime: 2023-01-01T00:00:00
+    min_metrics_ping_submission_date: 2023-01-01
     reported_metrics_ping: true
     reported_first_session_ping: false
     reported_baseline_ping: true
-    min_metrics_ping_submission_date: 2023-01-01
-    install_source__source_ping_datetime: '2023-01-01T00:00:00'
-    install_source__source_ping: metrics
 - client_id: client-2
   sample_id: 50
   first_seen_date: 2022-12-25
   submission_date: 2022-12-25
   device_model: model-2
+  last_reported_device_model: model-2
   adjust_network: Organic
   last_reported_adjust_network: Organic
-  last_reported_device_model: model-2
   activated: false
   metadata:
     reported_metrics_ping: true
     reported_first_session_ping: false
     reported_baseline_ping: false
     min_metrics_ping_submission_date: 2023-01-01
-    adjust_network__source_ping: metrics
-    adjust_network__source_ping_datetime: '2023-01-01T00:00:00'
 - client_id: client-3
   sample_id: 50
   adjust_network: Organic

diff --git a/...-prod/fenix_derived/firefox_android_clients_v1/test_first_session_no_baseline/expect.yaml b/...-prod/fenix_derived/firefox_android_clients_v1/test_first_session_no_baseline/expect.yaml
@@ -30,18 +30,18 @@
     adjust_network__source_ping_datetime: '2023-05-02T00:00:00'
 - client_id: client-3
   sample_id: 70
+  install_source: com.android.vending
   first_seen_date: 2023-05-01
   submission_date: 2023-05-02
   first_run_date: 2023-05-01
   last_reported_date: 2023-05-02
   last_reported_channel: release
   channel: release
   activated: false
-  install_source: com.android.vending
   metadata:
+    install_source__source_ping_datetime: 2023-05-02T00:00:00
+    min_metrics_ping_submission_date: 2023-05-02
     reported_first_session_ping: false
     reported_metrics_ping: true
     reported_baseline_ping: true
     install_source__source_ping: metrics
-    install_source__source_ping_datetime: '2023-05-02T00:00:00'
-    min_metrics_ping_submission_date: 2023-05-02
diff --git a/...a-shared-prod/fenix_derived/firefox_android_clients_v1/test_first_session_seq/expect.yaml b/...a-shared-prod/fenix_derived/firefox_android_clients_v1/test_first_session_seq/expect.yaml
@@ -31,20 +31,20 @@
 - client_id: client-3
   sample_id: 70
   first_seen_date: 2023-05-01
+  install_source: com.android.vending
   submission_date: 2023-05-02
   first_run_date: 2023-05-01
   last_reported_date: 2023-05-02
   last_reported_channel: release
   adjust_network: Untrusted Devices
   channel: release
   activated: false
-  install_source: com.android.vending
   metadata:
     reported_first_session_ping: true
     reported_metrics_ping: true
     reported_baseline_ping: true
     install_source__source_ping: metrics
-    install_source__source_ping_datetime: '2023-05-02T00:00:00'
+    install_source__source_ping_datetime: 2023-05-02T00:00:00
     min_metrics_ping_submission_date: 2023-05-02
     min_first_session_ping_submission_date: 2023-05-02
     min_first_session_ping_run_date: 2023-05-01

diff --git a/...a-shared-prod/fenix_derived/firefox_android_clients_v1/test_only_metrics_ping/expect.yaml b/...a-shared-prod/fenix_derived/firefox_android_clients_v1/test_only_metrics_ping/expect.yaml
@@ -9,16 +9,16 @@
   last_reported_country: CA
   sample_id: 54
   activated: false
-  adjust_network: 'Organic'
-  last_reported_adjust_network: 'Organic'
+  adjust_network: Organic
+  last_reported_adjust_network: Organic
   channel: release
   metadata:
+    adjust_network__source_ping: metrics
+    adjust_network__source_ping_datetime: 2023-01-01T00:00:00
+    min_metrics_ping_submission_date: 2023-01-01
     reported_first_session_ping: false
     reported_metrics_ping: true
     reported_baseline_ping: true
-    min_metrics_ping_submission_date: 2023-01-01
-    adjust_network__source_ping_datetime: '2023-01-01T00:00:00'
-    adjust_network__source_ping: metrics
 - client_id: client-2
   install_source: 'Test Install Source'
   sample_id: 40