From 8c6d58f65d94f081a7e869383facaee4980400ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 9 Dec 2019 20:42:48 +0100
Subject: [PATCH] test: move TEST-10-ISSUE-2467 setup to static files

---
 test/TEST-10-ISSUE-2467/test.sh        | 29 +-------------------------
 test/meson.build                       |  2 ++
 test/test-functions                    |  1 +
 test/testsuite-10.units/test10.service |  6 ++++++
 test/testsuite-10.units/test10.socket  |  2 ++
 test/units/testsuite-10.service        |  6 ++++++
 6 files changed, 18 insertions(+), 28 deletions(-)
 create mode 100644 test/testsuite-10.units/test10.service
 create mode 100644 test/testsuite-10.units/test10.socket
 create mode 100644 test/units/testsuite-10.service

diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh
index 1761ad1e43..4cd7adf6bb 100755
--- a/test/TEST-10-ISSUE-2467/test.sh
+++ b/test/TEST-10-ISSUE-2467/test.sh
@@ -14,35 +14,8 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-        dracut_install true rm socat
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
-[Unit]
-Description=Testsuite service
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; printf x > test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'
-EOF
-
-	cat  >$initdir/etc/systemd/system/test.socket <<'EOF'
-[Socket]
-ListenStream=/run/test.ctl
-EOF
-
-	cat > $initdir/etc/systemd/system/test.service <<'EOF'
-[Unit]
-Requires=test.socket
-ConditionPathExistsGlob=/tmp/nonexistent
-
-[Service]
-ExecStart=/bin/true
-EOF
-
-        setup_testsuite
     )
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 10
diff --git a/test/meson.build b/test/meson.build
index 295b7092c8..f0444b8fa1 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -16,6 +16,8 @@ install_subdir('testsuite-04.units',
                install_dir : testdata_dir)
 install_subdir('testsuite-06.units',
                install_dir : testdata_dir)
+install_subdir('testsuite-10.units',
+               install_dir : testdata_dir)
 
 testsuite08_dir = testdata_dir + '/testsuite-08.units'
 install_data('testsuite-08.units/-.mount',
diff --git a/test/test-functions b/test/test-functions
index 410d79d0bb..19402b3988 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -64,6 +64,7 @@ BASICTOOLS=(
     setsid
     sh
     sleep
+    socat
     sulogin
     tail
     tee
diff --git a/test/testsuite-10.units/test10.service b/test/testsuite-10.units/test10.service
new file mode 100644
index 0000000000..d0be786b01
--- /dev/null
+++ b/test/testsuite-10.units/test10.service
@@ -0,0 +1,6 @@
+[Unit]
+Requires=test10.socket
+ConditionPathExistsGlob=/tmp/nonexistent
+
+[Service]
+ExecStart=true
diff --git a/test/testsuite-10.units/test10.socket b/test/testsuite-10.units/test10.socket
new file mode 100644
index 0000000000..9cceebbb8e
--- /dev/null
+++ b/test/testsuite-10.units/test10.socket
@@ -0,0 +1,2 @@
+[Socket]
+ListenStream=/run/test.ctl
diff --git a/test/units/testsuite-10.service b/test/units/testsuite-10.service
new file mode 100644
index 0000000000..13756cfa51
--- /dev/null
+++ b/test/units/testsuite-10.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-10-ISSUE-2467
+
+[Service]
+Type=oneshot
+ExecStart=sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test10.socket; printf x >test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'