From bdcaf5a9c1b7d543b0d9cea61f6a05647148ebed Mon Sep 17 00:00:00 2001 From: kaguillera Date: Fri, 5 Jun 2020 12:46:36 -0400 Subject: [PATCH] Fix Travis testing on master --- .travis.yml | 6 ++---- tests/data/external/test01 | 4 ++++ tests/scripts/run_tests.sh | 9 +++++++++ tests/scripts/utils.py | 5 ++++- 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 tests/data/external/test01 create mode 100755 tests/scripts/run_tests.sh diff --git a/.travis.yml b/.travis.yml index 367da4d1..6db3164e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,10 +58,8 @@ install: - snakemake renv_restore script: - - cp -r tests/data/raw/* data/raw - - snakemake --profile tests/settings - - python -m unittest discover tests/scripts/ -v - + - bash tests/scripts/run_tests.sh + notifications: email: false slack: diff --git a/tests/data/external/test01 b/tests/data/external/test01 new file mode 100644 index 00000000..d7fa0e2e --- /dev/null +++ b/tests/data/external/test01 @@ -0,0 +1,4 @@ +wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun +android +test01 android +2020/01/01,2020/06/01 diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh new file mode 100755 index 00000000..62e7c67a --- /dev/null +++ b/tests/scripts/run_tests.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Commmands necessary to setup and run the tests for RAPIDS + +cp -r tests/data/raw/* data/raw +cp tests/data/external/* data/external +sed -e '10,20 s/^/#/' -e 's/rules.download_dataset.output/"data\/raw\/\{pid\}\/\{sensor\}_raw\.csv"/' rules/preprocessing.snakefile > tmp +cp tmp rules/preprocessing.snakefile +snakemake --profile tests/settings +python -m unittest discover tests/scripts/ -v \ No newline at end of file diff --git a/tests/scripts/utils.py b/tests/scripts/utils.py index 37fdc0be..e1bb26c2 100644 --- a/tests/scripts/utils.py +++ b/tests/scripts/utils.py @@ -90,7 +90,10 @@ def generate_sensor_file_lists(configs): for sensor in sensors: if sensor == 'messages': sensor = 'sms' - sensor_cap = 'SMS' + sensor_cap = sensor.upper() + elif sensor == 'calls': + sensor_cap = sensor.upper() + sensor = 'call' else: sensor_cap = sensor.upper() if 'DAY_SEGMENTS' in configs[sensor_cap]: