From 17f520d5e659ac66d0625c242ed9fe05a6559344 Mon Sep 17 00:00:00 2001
From: JulioV <JulioV@users.noreply.github.com>
Date: Tue, 20 Apr 2021 17:28:06 -0400
Subject: [PATCH] Delete android from fitbit test pid

---
 tests/data/external/participant_files/fitbit.yaml | 10 +++++-----
 tests/data/external/timesegments_event.csv        |  2 ++
 tests/scripts/run_tests.sh                        | 12 ++++++------
 tests/settings/mtz_event_config.yaml              |  2 +-
 tests/settings/mtz_frequency_config.yaml          |  2 +-
 tests/settings/mtz_periodic_config.yaml           |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/data/external/participant_files/fitbit.yaml b/tests/data/external/participant_files/fitbit.yaml
index f346e7bf..57ee8153 100644
--- a/tests/data/external/participant_files/fitbit.yaml
+++ b/tests/data/external/participant_files/fitbit.yaml
@@ -1,9 +1,9 @@
 PHONE:
-  DEVICE_IDS: [android]
-  PLATFORMS: [android]
-  LABEL: android
-  START_DATE: 2020-03-06
-  END_DATE: 2020-11-03
+  DEVICE_IDS: 
+  PLATFORMS: 
+  LABEL:
+  START_DATE: 
+  END_DATE:
 FITBIT:
   DEVICE_IDS: [fitbit]
   LABEL: fitbit
diff --git a/tests/data/external/timesegments_event.csv b/tests/data/external/timesegments_event.csv
index 36457d03..a89f46be 100644
--- a/tests/data/external/timesegments_event.csv
+++ b/tests/data/external/timesegments_event.csv
@@ -3,6 +3,8 @@ beforeMarchEvent,1583625600000,22H,3H,-1,android
 beforeNovemberEvent,1604185200000,22H,3H,-1,android
 beforeMarchEvent,1583625600000,22H,3H,-1,ios
 beforeNovemberEvent,1604185200000,22H,3H,-1,ios
+beforeMarchEvent,1583625600000,22H,3H,-1,fitbit
+beforeNovemberEvent,1604185200000,22H,3H,-1,fitbit
 beforeMarchEvent,1583625600000,22H,3H,-1,empatica
 beforeNovemberEvent,1604185200000,22H,3H,-1,empatica
 beforeMarchEvent,1583625600000,22H,3H,-1,empty
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
index 9916c4b1..fb7dd833 100755
--- a/tests/scripts/run_tests.sh
+++ b/tests/scripts/run_tests.sh
@@ -64,22 +64,22 @@ if { [ "$TYPE" == 'all' ]; }
 then
     TYPE="stz_frequency"
     run_pipeline
-    python tests/scripts/run_tests.py stz_frequency
+    python tests/scripts/run_tests.py stz_frequency || exit
     TYPE="mtz_frequency"
     run_pipeline
-    python tests/scripts/run_tests.py mtz_frequency
+    python tests/scripts/run_tests.py mtz_frequency || exit
     TYPE="stz_periodic"
     run_pipeline
-    python tests/scripts/run_tests.py stz_periodic
+    python tests/scripts/run_tests.py stz_periodic || exit
     TYPE="mtz_periodic"
     run_pipeline
-    python tests/scripts/run_tests.py mtz_periodic
+    python tests/scripts/run_tests.py mtz_periodic || exit
     TYPE="stz_event"
     run_pipeline
-    python tests/scripts/run_tests.py stz_event
+    python tests/scripts/run_tests.py stz_event || exit
     TYPE="mtz_event"
     run_pipeline
-    python tests/scripts/run_tests.py mtz_event
+    python tests/scripts/run_tests.py mtz_event || exit
 else
     if { [ "$ACTION" != 'test' ] && [ "$ACTION" != 'run' ] && [ "$ACTION" != 'both' ]; }
     then
diff --git a/tests/settings/mtz_event_config.yaml b/tests/settings/mtz_event_config.yaml
index d3eaef03..978f42a4 100644
--- a/tests/settings/mtz_event_config.yaml
+++ b/tests/settings/mtz_event_config.yaml
@@ -38,7 +38,7 @@ TIMEZONE:
       DEFAULT_TZCODE: America/New_York
       FITBIT: 
         ALLOW_MULTIPLE_TZ_PER_DEVICE: True
-        INFER_FROM_SMARTPHONE_TZ: True
+        INFER_FROM_SMARTPHONE_TZ: False
 
 ########################################################################################################################
 #                                                 PHONE                                                                #
diff --git a/tests/settings/mtz_frequency_config.yaml b/tests/settings/mtz_frequency_config.yaml
index 357d27d7..0b256449 100644
--- a/tests/settings/mtz_frequency_config.yaml
+++ b/tests/settings/mtz_frequency_config.yaml
@@ -38,7 +38,7 @@ TIMEZONE:
       DEFAULT_TZCODE: America/New_York
       FITBIT: 
         ALLOW_MULTIPLE_TZ_PER_DEVICE: True
-        INFER_FROM_SMARTPHONE_TZ: True
+        INFER_FROM_SMARTPHONE_TZ: False
 
 ########################################################################################################################
 #                                                 PHONE                                                                #
diff --git a/tests/settings/mtz_periodic_config.yaml b/tests/settings/mtz_periodic_config.yaml
index 01bbf0ef..bddd611f 100644
--- a/tests/settings/mtz_periodic_config.yaml
+++ b/tests/settings/mtz_periodic_config.yaml
@@ -38,7 +38,7 @@ TIMEZONE:
       DEFAULT_TZCODE: America/New_York
       FITBIT: 
         ALLOW_MULTIPLE_TZ_PER_DEVICE: True
-        INFER_FROM_SMARTPHONE_TZ: True
+        INFER_FROM_SMARTPHONE_TZ: False
 
 ########################################################################################################################
 #                                                 PHONE                                                                #