From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 17 Sep 2019 10:22:19 +0000 (+0200)
Subject: test: rename TEST-EXECRELOAD to avoid name conflict
X-Git-Tag: v244-rc1~285
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=8813a8c332ff956c41b82ef1e2792495ebf924d5;p=systemd%2F.git

test: rename TEST-EXECRELOAD to avoid name conflict
---

diff --git a/test/TEST-37-EXECRELOAD/Makefile b/test/TEST-37-EXECRELOAD/Makefile
deleted file mode 120000
index e9f93b1104..0000000000
--- a/test/TEST-37-EXECRELOAD/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../TEST-01-BASIC/Makefile
\ No newline at end of file
diff --git a/test/TEST-37-EXECRELOAD/test.sh b/test/TEST-37-EXECRELOAD/test.sh
deleted file mode 100755
index 7eb9db415a..0000000000
--- a/test/TEST-37-EXECRELOAD/test.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-set -e
-TEST_DESCRIPTION="Test ExecReload= (PR #13098)"
-
-. $TEST_BASE_DIR/test-functions
-
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        dracut_install mktemp
-
-        # mask some services that we do not want to run in these tests
-        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
-        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
-        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
-        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
-        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
-        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/bin/bash -x /testsuite.sh
-Type=oneshot
-StandardOutput=tty
-StandardError=tty
-NotifyAccess=all
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
-    )
-    setup_nspawn_root
-}
-
-do_test "$@"
diff --git a/test/TEST-37-EXECRELOAD/testsuite.sh b/test/TEST-37-EXECRELOAD/testsuite.sh
deleted file mode 100644
index a51f6fd5cc..0000000000
--- a/test/TEST-37-EXECRELOAD/testsuite.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-set -ex
-set -o pipefail
-
-systemd-analyze log-level debug
-systemd-analyze log-target console
-
-export SYSTEMD_PAGER=
-SERVICE_PATH="$(mktemp /etc/systemd/system/execreloadXXX.service)"
-SERVICE_NAME="${SERVICE_PATH##*/}"
-
-echo "[#1] Failing ExecReload= should not kill the service"
-cat > "$SERVICE_PATH" << EOF
-[Service]
-ExecStart=/bin/sleep infinity
-ExecReload=/bin/false
-EOF
-
-systemctl daemon-reload
-systemctl start $SERVICE_NAME
-systemctl status $SERVICE_NAME
-# The reload SHOULD fail but SHOULD NOT affect the service state
-! systemctl reload $SERVICE_NAME
-systemctl status $SERVICE_NAME
-systemctl stop $SERVICE_NAME
-
-
-echo "[#2] Failing ExecReload= should not kill the service (multiple ExecReload=)"
-cat > "$SERVICE_PATH" << EOF
-[Service]
-ExecStart=/bin/sleep infinity
-ExecReload=/bin/true
-ExecReload=/bin/false
-ExecReload=/bin/true
-EOF
-
-systemctl daemon-reload
-systemctl start $SERVICE_NAME
-systemctl status $SERVICE_NAME
-# The reload SHOULD fail but SHOULD NOT affect the service state
-! systemctl reload $SERVICE_NAME
-systemctl status $SERVICE_NAME
-systemctl stop $SERVICE_NAME
-
-echo "[#3] Failing ExecReload=- should not affect reload's exit code"
-cat > "$SERVICE_PATH" << EOF
-[Service]
-ExecStart=/bin/sleep infinity
-ExecReload=-/bin/false
-EOF
-
-systemctl daemon-reload
-systemctl start $SERVICE_NAME
-systemctl status $SERVICE_NAME
-systemctl reload $SERVICE_NAME
-systemctl status $SERVICE_NAME
-systemctl stop $SERVICE_NAME
-
-systemd-analyze log-level info
-
-echo OK > /testok
-
-exit 0
diff --git a/test/TEST-39-EXECRELOAD/Makefile b/test/TEST-39-EXECRELOAD/Makefile
new file mode 120000
index 0000000000..e9f93b1104
--- /dev/null
+++ b/test/TEST-39-EXECRELOAD/Makefile
@@ -0,0 +1 @@
+../TEST-01-BASIC/Makefile
\ No newline at end of file
diff --git a/test/TEST-39-EXECRELOAD/test.sh b/test/TEST-39-EXECRELOAD/test.sh
new file mode 100755
index 0000000000..7eb9db415a
--- /dev/null
+++ b/test/TEST-39-EXECRELOAD/test.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+TEST_DESCRIPTION="Test ExecReload= (PR #13098)"
+
+. $TEST_BASE_DIR/test-functions
+
+test_setup() {
+    create_empty_image_rootdir
+
+    # Create what will eventually be our root filesystem onto an overlay
+    (
+        LOG_LEVEL=5
+        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
+
+        setup_basic_environment
+        dracut_install mktemp
+
+        # mask some services that we do not want to run in these tests
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
+
+        # setup the testsuite service
+        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+[Unit]
+Description=Testsuite service
+
+[Service]
+ExecStart=/bin/bash -x /testsuite.sh
+Type=oneshot
+StandardOutput=tty
+StandardError=tty
+NotifyAccess=all
+EOF
+        cp testsuite.sh $initdir/
+
+        setup_testsuite
+    )
+    setup_nspawn_root
+}
+
+do_test "$@"
diff --git a/test/TEST-39-EXECRELOAD/testsuite.sh b/test/TEST-39-EXECRELOAD/testsuite.sh
new file mode 100644
index 0000000000..a51f6fd5cc
--- /dev/null
+++ b/test/TEST-39-EXECRELOAD/testsuite.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+set -ex
+set -o pipefail
+
+systemd-analyze log-level debug
+systemd-analyze log-target console
+
+export SYSTEMD_PAGER=
+SERVICE_PATH="$(mktemp /etc/systemd/system/execreloadXXX.service)"
+SERVICE_NAME="${SERVICE_PATH##*/}"
+
+echo "[#1] Failing ExecReload= should not kill the service"
+cat > "$SERVICE_PATH" << EOF
+[Service]
+ExecStart=/bin/sleep infinity
+ExecReload=/bin/false
+EOF
+
+systemctl daemon-reload
+systemctl start $SERVICE_NAME
+systemctl status $SERVICE_NAME
+# The reload SHOULD fail but SHOULD NOT affect the service state
+! systemctl reload $SERVICE_NAME
+systemctl status $SERVICE_NAME
+systemctl stop $SERVICE_NAME
+
+
+echo "[#2] Failing ExecReload= should not kill the service (multiple ExecReload=)"
+cat > "$SERVICE_PATH" << EOF
+[Service]
+ExecStart=/bin/sleep infinity
+ExecReload=/bin/true
+ExecReload=/bin/false
+ExecReload=/bin/true
+EOF
+
+systemctl daemon-reload
+systemctl start $SERVICE_NAME
+systemctl status $SERVICE_NAME
+# The reload SHOULD fail but SHOULD NOT affect the service state
+! systemctl reload $SERVICE_NAME
+systemctl status $SERVICE_NAME
+systemctl stop $SERVICE_NAME
+
+echo "[#3] Failing ExecReload=- should not affect reload's exit code"
+cat > "$SERVICE_PATH" << EOF
+[Service]
+ExecStart=/bin/sleep infinity
+ExecReload=-/bin/false
+EOF
+
+systemctl daemon-reload
+systemctl start $SERVICE_NAME
+systemctl status $SERVICE_NAME
+systemctl reload $SERVICE_NAME
+systemctl status $SERVICE_NAME
+systemctl stop $SERVICE_NAME
+
+systemd-analyze log-level info
+
+echo OK > /testok
+
+exit 0