Refactor ready:script to support new notify framework

Follow-up to abcb3ce, calling the service ready:script when readiness
has been signaled to or detected by Finit.

Issue #300

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

test/Makefile.am

@@ -1,12 +1,12 @@
 SUBDIRS                  = common tenv
 
-EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/bin/slay \
-			   skel/etc/env skel/bin/pre.sh skel/bin/post.sh skel/sbin/task.sh   \
+EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/etc/env  \
+			   skel/bin/pre.sh skel/bin/post.sh skel/bin/ready.sh skel/bin/slay  \
 			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	     \
 			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		     \
 			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	     \
-			   skel/etc/finit.d/.empty skel/etc/init.d/S01-service.sh 	     \
-			   skel/etc/init.d/S02-serv.sh					     \
+			   skel/etc/finit.d/.empty skel/sbin/task.sh 	                     \
+			   skel/etc/init.d/S01-service.sh skel/etc/init.d/S02-serv.sh	     \
 			   skel/proc/.empty skel/root/.empty skel/run/.empty		     \
 			   skel/sbin/chrootsetup.sh skel/srv/.empty skel/sys/.empty	     \
 			   skel/usr/bin/.empty skel/usr/lib/.empty skel/usr/sbin/.empty	     \
@@ -26,6 +26,7 @@ EXTRA_DIST		+= global-envs.sh
 EXTRA_DIST		+= initctl-status-subset.sh
 EXTRA_DIST		+= notify.sh
 EXTRA_DIST		+= pre-post-serv.sh
+EXTRA_DIST		+= ready-serv.sh
 EXTRA_DIST		+= restart-self.sh
 EXTRA_DIST		+= runlevel.sh
 EXTRA_DIST		+= start-stop-service.sh
@@ -56,6 +57,7 @@ TESTS			+= global-envs.sh
 TESTS			+= initctl-status-subset.sh
 TESTS			+= notify.sh
 TESTS			+= pre-post-serv.sh
+TESTS			+= ready-serv.sh
 TESTS			+= restart-self.sh
 TESTS			+= runlevel.sh
 TESTS			+= start-stop-service.sh

test/ready-serv.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+# Verify ready:script for pid/systemd/s6 style services
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+	say "Test start $(date)"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+
+	texec rm -f "$FINIT_CONF"
+}
+
+test_one()
+{
+	service=$1
+	file=/tmp/ready
+
+	say "Add service stanza '$service' to $FINIT_CONF ..."
+	texec sh -c "echo '$service' > $FINIT_CONF"
+
+	say 'Reload Finit'
+	texec sh -c "initctl reload"
+
+	retry 'assert_num_children 1 serv'
+	assert_file_contains "$file" "READY"
+	texec sh -c "rm -f $file"
+
+	say 'Stop the service'
+	texec sh -c "initctl stop serv"
+	retry 'assert_num_children 0 serv'
+
+	say "Done, drop service from $FINIT_CONF ..."
+	texec sh -c "rm $FINIT_CONF"
+	texec sh -c "initctl reload"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+#texec sh -c "initctl debug"
+
+test_one "service                ready:/bin/ready.sh serv -np       -- Native style notification"
+test_one "service notify:s6      ready:/bin/ready.sh serv -np -N %n -- s6 style notification"
+test_one "service notify:systemd ready:/bin/ready.sh serv -np       -- systemd style notification"

test/skel/bin/ready.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "READY" > /tmp/ready