From f342a9e121059b734af8bf0ce6430c60afbaa09c Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 26 Sep 2019 14:39:11 +0300 Subject: Travis: restructure test scripts --- .travis.yml | 3 +-- .travis/online_sessions.sh | 47 ------------------------------------- .travis/test.sh | 9 +++++++ .travis/test/online_sessions.sh | 52 +++++++++++++++++++++++++++++++++++++++++ .travis/test/track_status.sh | 48 +++++++++++++++++++++++++++++++++++++ .travis/track_status.sh | 43 ---------------------------------- 6 files changed, 110 insertions(+), 92 deletions(-) delete mode 100755 .travis/online_sessions.sh create mode 100755 .travis/test.sh create mode 100755 .travis/test/online_sessions.sh create mode 100755 .travis/test/track_status.sh delete mode 100755 .travis/track_status.sh diff --git a/.travis.yml b/.travis.yml index a6896ed..c4f6dd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,4 @@ script: - python3 -m bin.show_status egor.tensin - - ./.travis/track_status.sh - - ./.travis/online_sessions.sh + - ./.travis/test.sh diff --git a/.travis/online_sessions.sh b/.travis/online_sessions.sh deleted file mode 100755 index 112b46e..0000000 --- a/.travis/online_sessions.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -o nounset -o pipefail - -readonly db_path='.travis/test_db.csv' - -_online_sessions() { - local output_path - output_path="$( mktemp --dry-run )" - - local rm_aux_files - rm_aux_files="$( printf -- 'rm -f -- %q' "$output_path" )" - - trap "$rm_aux_files" RETURN - - echo "Running online_sessions.py..." - python3 -m bin.online_sessions "$@" "$db_path" "$output_path" - - if file --brief --dereference --mime -- "$output_path" | grep --quiet -- 'charset=binary$'; then - echo 'Output is a binary file, not going to show that' - return 0 - fi - - echo "Output:" - cat "$output_path" -} - -online_sessions() { - # Get rid of: - # tkinter.TclError: no display name and no $DISPLAY environment variable - mkdir -p -- ~/.config/matplotlib - echo 'backend: Agg' > ~/.config/matplotlib/matplotlibrc - - _online_sessions --group-by user --output-format csv - _online_sessions --group-by user --output-format json - - _online_sessions --group-by user --output-format plot - _online_sessions --group-by hour --output-format plot - _online_sessions --group-by date --output-format plot - _online_sessions --group-by weekday --output-format plot -} - -main() { - online_sessions -} - -main "$@" diff --git a/.travis/test.sh b/.travis/test.sh new file mode 100755 index 0000000..07b9b71 --- /dev/null +++ b/.travis/test.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +./.travis/test/track_status.sh +./.travis/test/online_sessions.sh diff --git a/.travis/test/online_sessions.sh b/.travis/test/online_sessions.sh new file mode 100755 index 0000000..0bf578c --- /dev/null +++ b/.travis/test/online_sessions.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +set -o errexit -o nounset -o pipefail + +readonly db_path='.travis/test_db.csv' + +_online_sessions() { + local output_path + output_path="$( mktemp --dry-run )" + + local rm_aux_files + rm_aux_files="$( printf -- 'rm -f -- %q' "$output_path" )" + + trap "$rm_aux_files" RETURN + + echo "Running online_sessions.py..." + python3 -m bin.online_sessions "$@" "$db_path" "$output_path" + + if file --brief --dereference --mime -- "$output_path" | grep --quiet -- 'charset=binary$'; then + echo 'Output is a binary file, not going to show that' + return 0 + fi + + echo "Output:" + cat "$output_path" +} + +online_sessions() { + # Get rid of: + # tkinter.TclError: no display name and no $DISPLAY environment variable + mkdir -p -- ~/.config/matplotlib + echo 'backend: Agg' > ~/.config/matplotlib/matplotlibrc + + _online_sessions --group-by user --output-format csv + _online_sessions --group-by user --output-format json + + _online_sessions --group-by user --output-format plot + _online_sessions --group-by hour --output-format plot + _online_sessions --group-by date --output-format plot + _online_sessions --group-by weekday --output-format plot +} + +main() { + online_sessions +} + +main "$@" diff --git a/.travis/test/track_status.sh b/.travis/test/track_status.sh new file mode 100755 index 0000000..a021398 --- /dev/null +++ b/.travis/test/track_status.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +set -o errexit -o nounset -o pipefail + +track_status() { + local log_path + log_path="$( mktemp )" + echo "Log file path: $log_path" + + local db_path + db_path="$( mktemp --dry-run )" + echo "DB file path: $db_path" + + local rm_aux_files + rm_aux_files="$( printf -- 'rm -f -- %q %q' "$log_path" "$db_path" )" + + trap "$rm_aux_files" RETURN + + echo 'Running track_status.py...' + python3 -m bin.track_status egor.tensin --log "$log_path" --format csv --output "$db_path" & + local pid="$!" + echo "Its PID is $pid" + + local timeout=15 + echo "Sleeping for $timeout seconds..." + sleep "$timeout" + + echo 'Terminating track_status.py...' + kill -SIGINT "$pid" + echo 'Waiting for track_status.py to terminate...' + wait "$pid" + + echo "Log file:" + cat "$log_path" + echo "DB:" + cat "$db_path" +} + +main() { + track_status +} + +main "$@" diff --git a/.travis/track_status.sh b/.travis/track_status.sh deleted file mode 100755 index 91be5a3..0000000 --- a/.travis/track_status.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -o nounset -o pipefail - -track_status() { - local log_path - log_path="$( mktemp )" - echo "Log file path: $log_path" - - local db_path - db_path="$( mktemp --dry-run )" - echo "DB file path: $db_path" - - local rm_aux_files - rm_aux_files="$( printf -- 'rm -f -- %q %q' "$log_path" "$db_path" )" - - trap "$rm_aux_files" RETURN - - echo 'Running track_status.py...' - python3 -m bin.track_status egor.tensin --log "$log_path" --format csv --output "$db_path" & - local pid="$!" - echo "Its PID is $pid" - - local timeout=15 - echo "Sleeping for $timeout seconds..." - sleep "$timeout" - - echo 'Terminating track_status.py...' - kill -SIGINT "$pid" - echo 'Waiting for track_status.py to terminate...' - wait "$pid" - - echo "Log file:" - cat "$log_path" - echo "DB:" - cat "$db_path" -} - -main() { - track_status -} - -main "$@" -- cgit v1.2.3