From 5a522863092c677c392c34d477d245e583144d46 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 17 Jul 2019 17:44:42 -0400 Subject: [PATCH] fix: ensure the dokku-retire timer is properly installed Closes #3615 --- plugins/scheduler-docker-local/install | 6 ++++++ tests/unit/30_scheduler-docker-local.bats | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 tests/unit/30_scheduler-docker-local.bats diff --git a/plugins/scheduler-docker-local/install b/plugins/scheduler-docker-local/install index 174853aa8..41e05975d 100755 --- a/plugins/scheduler-docker-local/install +++ b/plugins/scheduler-docker-local/install @@ -38,9 +38,15 @@ Description=Run dokku-retire.service every 5 minutes [Timer] OnCalendar=*:0/5 +Persistent=true + +[Install] +WantedBy=timers.target EOF if command -v systemctl &>/dev/null; then systemctl --quiet reenable dokku-retire + systemctl --quiet enable dokku-retire.timer + systemctl --quiet start dokku-retire.timer fi else cat </etc/cron.d/dokku-retire diff --git a/tests/unit/30_scheduler-docker-local.bats b/tests/unit/30_scheduler-docker-local.bats new file mode 100644 index 000000000..1a2b39336 --- /dev/null +++ b/tests/unit/30_scheduler-docker-local.bats @@ -0,0 +1,18 @@ +#!/usr/bin/env bats + +load test_helper + +setup() { + global_setup +} + +teardown() { + global_teardown +} + +@test "(scheduler-docker-local) timer installed" { + run /bin/bash -c "systemctl list-timers | grep dokku-retire" + echo "output: $output" + echo "status: $status" + assert_success +}