From a8d45eff28e7e186d0749e3e9cf980a23d93231e Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Fri, 24 May 2019 17:07:22 +0300
Subject: Implement shutdown components

* src/pies.h: Update comment.
* src/progman.c (register_prog0): Register shutdown components
in disabled state.
(program_shutdown): New function.
(progman_stop): Call program_shutdown.

* tests/shutdown.at: New test.
* tests/Makefile.am: Add new test.
* tests/testsuite.at: Likewise.
* tests/aux/startup: Rename to tests/aux/touchfile
* tests/startup.at: Reflect the change.
---
 tests/Makefile.am   |  3 ++-
 tests/aux/startup   |  7 -------
 tests/aux/touchfile |  7 +++++++
 tests/shutdown.at   | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/startup.at    |  4 ++--
 tests/testsuite.at  |  1 +
 6 files changed, 70 insertions(+), 10 deletions(-)
 delete mode 100755 tests/aux/startup
 create mode 100755 tests/aux/touchfile
 create mode 100644 tests/shutdown.at

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2f2719..b404ed4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,7 @@ AUXTOOLS = \
  aux/respawn\
  aux/retcode\
  aux/mailer\
- aux/startup
+ aux/touchfile
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 $(AUXTOOLS)
 DISTCLEANFILES       = atconfig $(check_SCRIPTS)
@@ -53,6 +53,7 @@ TESTSUITE_AT = \
  ret-exec.at\
  ret-notify.at\
  startup.at\
+ shutdown.at\
  version.at
 
 TESTSUITE = $(srcdir)/testsuite
diff --git a/tests/aux/startup b/tests/aux/startup
deleted file mode 100755
index b9d92a3..0000000
--- a/tests/aux/startup
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-dir=${1:?}
-time=${2:?}
-tag=${3:?}
-
-touch $dir/$tag
-sleep $time
diff --git a/tests/aux/touchfile b/tests/aux/touchfile
new file mode 100755
index 0000000..b9d92a3
--- /dev/null
+++ b/tests/aux/touchfile
@@ -0,0 +1,7 @@
+#!/bin/sh
+dir=${1:?}
+time=${2:?}
+tag=${3:?}
+
+touch $dir/$tag
+sleep $time
diff --git a/tests/shutdown.at b/tests/shutdown.at
new file mode 100644
index 0000000..79bec37
--- /dev/null
+++ b/tests/shutdown.at
@@ -0,0 +1,58 @@
+# This file is part of GNU pies testsuite. -*- Autotest -*-
+# Copyright (C) 2019 Sergey Poznyakoff
+#
+# GNU pies is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU pies is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU pies.  If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([Shutdown components])
+
+AT_CHECK([
+PIES_XFAIL_CHECK
+PIES_CONTROL_INIT
+comp_pid_file=$PWD/comp.pid
+
+cat > pies.conf <<_EOT
+component s {
+	mode shutdown;
+	command "$auxdir/touchfile $PWD 0 shutdown";
+}
+
+component test {
+	mode respawn;
+	command "$auxdir/respawn -append -pid $comp_pid_file";
+}
+_EOT
+
+pies --config-file control.conf --config-file pies.conf
+
+n=0
+while :
+do
+    if test -f $comp_pid_file; then
+        break
+    fi
+    sleep 1
+    n=$(($n + 1))
+    if test $n -gt 10; then
+        echo >&2 "timed out"
+	break
+    fi
+done
+
+PIES_STOP
+
+test -f shutdown
+])
+
+AT_CLEANUP
+
diff --git a/tests/startup.at b/tests/startup.at
index 72017ce..440c249 100644
--- a/tests/startup.at
+++ b/tests/startup.at
@@ -24,12 +24,12 @@ comp_pid_file=$PWD/comp.pid
 cat > pies.conf <<_EOT
 component b1 {
 	mode startup;
-	command "$auxdir/startup $PWD 1 b1";
+	command "$auxdir/touchfile $PWD 1 b1";
 }
 
 component b2 {
 	mode startup;
-	command "$auxdir/startup $PWD 2 b2";
+	command "$auxdir/touchfile $PWD 2 b2";
 }
 
 component test {
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 2a1167d..6775ee7 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -66,3 +66,4 @@ m4_include([redirect.at])
 m4_include([ret-exec.at])
 m4_include([ret-notify.at])
 m4_include([startup.at])
+m4_include([shutdown.at])
-- 
cgit v1.2.1