Further box-in testserv so it doesn't conflict with other serv tests

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

plugins/testserv.c

@@ -36,7 +36,7 @@
 #include "conf.h"
 
 #define SERV_DAEMON "serv"
-#define SERV_ARGS   "-n -p"
+#define SERV_ARGS   "-n -p -i testserv"
 #define SERV_DESC   "Test serv daemon"
 
 static void setup(void *arg)
@@ -66,7 +66,7 @@ static void setup(void *arg)
 	mksubsys("/tmp/serv", 0755, "root", "root");
 	umask(prev);
 
-	snprintf(line, sizeof(line), "[S123456789] pid:!/run/serv.pid cgroup.system %s %s -- %s",
+	snprintf(line, sizeof(line), "[S123456789] name:testserv pid:!/run/testserv.pid <boot/testserv> cgroup.system %s %s -- %s",
 		 cmd, SERV_ARGS, SERV_DESC);
 
 	if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL))

test/testserv.sh

@@ -1,15 +1,21 @@
 #!/bin/sh
 # Verify service readiness notification
+# shellcheck disable=SC2034
 
 set -eu
 #set -x
-TEST_DIR=$(dirname "$0")
+
 #DEBUG=true
+FINIT_ARGS="finit.cond=testserv"
+TEST_DIR=$(dirname "$0")
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
 
+run "initctl"
+run "initctl status testserv"
+run "initctl cond dump"
 sleep 1
-retry 'assert_norestart serv' 1 1
+retry 'assert_norestart testserv' 1 1
 
 return 0