From f21409856036ec307f57dbb4752b44bbb72ae846 Mon Sep 17 00:00:00 2001
From: Magnus Malm <magnusmalm@gmail.com>
Date: Wed, 24 Feb 2021 13:13:38 +0100
Subject: [PATCH] test: Minor refactor to reduce test code duplication

Signed-off-by: Magnus Malm <magnusmalm@gmail.com>
---
 test/lib.sh                                             | 4 ++++
 test/test_add_remove_dynamic_service/test.sh            | 4 ----
 test/test_add_remove_dynamic_service_sub_config/test.sh | 4 ----
 test/test_start_stop_service/test.sh                    | 4 ----
 test/test_start_stop_service_sub_config/test.sh         | 4 ----
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/test/lib.sh b/test/lib.sh
index 82e6b1e2..fa38a54e 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+assert_num_children() {
+    assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
+}
+
 texec() {
     # shellcheck disable=SC2154
     "$TEST_DIR/testenv_exec.sh" "$finit_pid" "$@"
diff --git a/test/test_add_remove_dynamic_service/test.sh b/test/test_add_remove_dynamic_service/test.sh
index 8637bc14..ed093131 100755
--- a/test/test_add_remove_dynamic_service/test.sh
+++ b/test/test_add_remove_dynamic_service/test.sh
@@ -6,10 +6,6 @@ TEST_DIR=$(dirname "$0")/..
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
 
-assert_num_children() {
-    assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
-}
-
 test_teardown() {
     say "Test done $(date)"
     say "Running test teardown..."
diff --git a/test/test_add_remove_dynamic_service_sub_config/test.sh b/test/test_add_remove_dynamic_service_sub_config/test.sh
index 97b82fc4..2e7196f4 100755
--- a/test/test_add_remove_dynamic_service_sub_config/test.sh
+++ b/test/test_add_remove_dynamic_service_sub_config/test.sh
@@ -6,10 +6,6 @@ TEST_DIR=$(dirname "$0")/..
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
 
-assert_num_children() {
-    assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
-}
-
 test_teardown() {
     say "Test done $(date)"
     say "Running test teardown..."
diff --git a/test/test_start_stop_service/test.sh b/test/test_start_stop_service/test.sh
index 7d0c2c5d..e1e21c4c 100755
--- a/test/test_start_stop_service/test.sh
+++ b/test/test_start_stop_service/test.sh
@@ -6,10 +6,6 @@ TEST_DIR=$(dirname "$0")/..
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
 
-assert_num_children() {
-    assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
-}
-
 test_teardown() {
     say "Test done $(date)"
     say "Running test teardown..."
diff --git a/test/test_start_stop_service_sub_config/test.sh b/test/test_start_stop_service_sub_config/test.sh
index 87026274..897592c4 100755
--- a/test/test_start_stop_service_sub_config/test.sh
+++ b/test/test_start_stop_service_sub_config/test.sh
@@ -6,10 +6,6 @@ TEST_DIR=$(dirname "$0")/..
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
 
-assert_num_children() {
-    assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
-}
-
 test_teardown() {
     say "Test done $(date)"
     say "Running test teardown..."